tweaking parameters
Merge branch 'master' of github.com:petitJAM/TGMC-Watson-Edition