Bumped version number
Merge branch 'release-0.3.6' into develop