Merge branch 'hotfix/0.2.1'
bump version
Merge branch 'hotfix/0.2.1' into develop