Merge branch 'develop'
v0.6.1