latest fixes for trainer tool
Merge branch 'master' of https://github.com/rhuang/semantix
Merge pull request #36 from dmilisav/master

Latest code for trainer tool.