fixed/improved the Regex part, see #7
Merge pull request #8 from e2b/master

Regex fixed