added more regexes
Merge pull request #1066 from Bart39/dev

added more regexes