Tokenizer separation implemented #384
Merge pull request #385 from emmanuel-keller/1.5

Tokenizer separation implemented #384