tokenizer api refactored
Merge branch 'master' into regexp