- enhance regexes
Merge pull request #43 from hadfl/regex_fix

- enhance regexes