improved tokenizer
Merge branch 'master' into jupis