Merge branch 'hotfix/0.2.2'
Version 0.2.2 changelog
Merge branch 'hotfix/0.2.2' into develop