Added tag 0.3.6 for changeset 7e8d4f5ecc731d932af6636c65499b84eb63f807