Fixed broken regexs'
Merge pull request #9 from maxnordlund/master

Fixed broken RegEXPs'