bumped version number
Merge branch 'release/v0.3.6' into develop