No luck with jsonp issue yet
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages