Patch tokenizer
Merge branch 'Antoine' into develop
Merge remote-tracking branch 'origin/develop' into Kevin
Update parser & tokenizer

commentary & method parse