Switched the URL

Trying to return json data
Merge branch 'master' into gh-pages