made tokenizer a global static object
Merge branch 'master' into Translator