forgot to pass a second string to "".replace. fun times
Merge branch 'master' into gh-pages