Merge pull request #1 from vincentarelbundock/master

Attempting to rebaseline. Hope I'm doing this correctly.
Regex updates
Merge pull request #22 from NilsTycho/regex-updates

Regex updates