Merge branch 'gh-pages'
json loaded, xml not so much
Merge branch 'master' into gh-pages