Merge branch 'release/0.6.0' into develop
bump version
Merge branch 'release/0.6.1' into develop
Merge branch 'develop'