Merge branch 'hotfix/v0.2.1'
Fix version number
Merge branch 'hotfix/v0.2.2' into develop