MWTP: first try of tokenizer
Merge branch 'master' into script-compiler-rewrite