Merge branch 'gh-pages'
config file
Merge branch 'master' into gh-pages