Cleaner regular expressions
Merge pull request #1 from tomsterritt/master

Cleaner regular expressions