added regex to improve matches

should work and fix false positives
Merge pull request #1 from zd9/master

added regex to improve matches