Merge branch 'hotfix/v0.2.1'