fixed some regex stuff
Merge pull request #2 from andylou2/master

fixed some regex stuff