hotfix
Merge branch 'hotfix/v0.6.1'