Misc callback for JSONP
Minor fixes until JSONP is working
Merge branch 'master' into gh-pages