moved regexs to dictionary file; fixed resulting problems
Simplify excellent pull request to be even easier, and not require 'eval'