Merge branch 'gh-pages'
escape things properly
Merge branch 'master' into gh-pages