Merge branch 'release/v0.2.1' into develop
Fix
Version 0.2.2
Merge branch 'release/v0.2.2'