0.3.6 changes
Merge branch 'release/0.3.6' into develop