readme
json structure
Merge branch 'master' into gh-pages