Merge branch 'release/0.2.1' into develop
fixed json
bumped version
Merge branch 'release/0.2.2'