use global regex in replace #24
Merge branch 'master' into gh-pages