Merge tag '0.6.0' into develop

Released 0.6.0 0.6.0
fixed json
bumped version
Merge branch 'release/0.6.1'