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