Better regexp.
Merge pull request #4 from troopjs/feature/regexp-update

Better regexp.