json optimisation
Merge branch 'dev'