Json appears to work, xml not yet
Merge branch 'dev' into gh-pages