Merge branch 'release/0.2.1' into develop
Fixes
Bump
Merge branch 'release/0.2.1-1'