Merge branch 'gh-pages'
better regex matching!
Merge branch 'master' into gh-pages