Bug fixes 1.07

Bug fixed in Trax
Merge pull request #89 from liboud/master

Bug fixes 1.07