clean up regex
Merge pull request #2 from reinierl/master

clean up regex