Merge branch 'gh-pages'
Change config.xml file
Merge branch 'master' into gh-pages