Get rid of the regex.
Merge pull request #368 from klynton/master

Get rid of the regex.
Updating for release 2.11