Merge branch 'hotfix/0.2.1'
Bump version
Merge branch 'hotfix/0.2.2' into develop