handle tokens with substrings
Merge pull request #9 from ninech/token-substitution-with-underlines

handle tokens with substrings