Use more regex-like syntax.
Merge pull request #24 from Tordek/regex

Use more regex-like syntax.