fix for ttJ
fix git mess
Merge pull request #155 from covarell/master

fix for ttJ