Regex fixes
Merge pull request #45 from AnyFetch/regex-fixes

Regex fixes