Use regexes instead of custom heuristics
Merge pull request #23 from eproxus/optimize

Use regexes instead of custom heuristics