Updated regex.
Merge pull request #36 from cam8001/regex-updates

Updated regex.