Merge branch 'gh-pages'
more efficient regex!
Merge branch 'master' into gh-pages