Incorporated regex thing
Merge branch 'master' of https://github.com/houbysoft/fixie