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