add words into parser
Merge remote-tracking branch 'origin/Kevin' into Antoine
patch positions