Few things + match with Choco-3.2.1
Merge branch 'master' of https://github.com/chocoteam/choco-parsers