Improved the RegEx
Merge pull request #124 from rmdstudio/master

Improved the RegEx