Change host from local to github
Merge branch 'master' into gh-pages