Merge pull request #368 from klynton/master

Get rid of the regex.