Merge branch 'hotfix/0.6.1' into develop
Version bump - 0.6.1
Merge branch 'develop'