Merge branch 'release/0.2'
Merge branch 'hotfix/0.2.1' into develop