Adding more JSON info
Merge branch 'master' into dev