Merge branch 'release/0.2.0' into develop
fixed scaffolding
bumped version
Merge branch 'release/0.2.1'