Add more info to JSON data
Merge branch 'master' into gh-pages

* master:
  Add more info to JSON data