More modern TokenizerDelegate
Merge pull request #1 from phatmann/master

More modern TokenizerDelegate