make regex more regex-y
Merge pull request #3 from auscompgeek/master

make regex more regex-y