Merge branch 'gh-pages'
bug fix for \. thing
Merge branch 'master' into gh-pages