Version 0.6.1
Merge branch 'hotfix-0.6.1'