Merge branch 'release/0.2.0' into develop
bugfix
bumped up version
Merge branch 'release/0.2.1'