Patch tokenizer
Merge branch 'Antoine' into develop