Merge branch 'release/0.6.0' into develop
fixed json syntax
bumped version
Merge branch 'release/0.6.1'