Merge branch 'release/0.2.0' into develop
minor bug fixes
bug fixes
Merge branch 'release/0.2.1'