Merge branch 'release/0.6.1' into develop
Update version
Merge branch 'develop'