Added tag 0.3.6 for changeset cf1dc4e03ff9