Version bump to 0.3.6
Merge branch 'release0.3.6' into develop