Merge pull request #43 from shdwjk/prod-TokenNameNumber

TokenNameNumber -- Add escaping to names for regular expression matching.