Merge branch 'release/0.6.1'
Merge branch 'develop'
Merge branch 'develop'
Updated changelog