Merge branch 'release/0.3.5' into develop
Updated changelog
Merge branch 'develop'