trying to fix cross origin problems
hopefully fixed cross origin
Merge branch 'master' into gh-pages