Merge branch 'hotfix/0.2.2'
bumped version for hotfix
Merge branch 'master' into develop