Merge pull request #15 from d10/master

Optimize regexes and fix font regex issue