Fix example
Merge branch 'json' into dev