latest fixes for trainer tool
Merge pull request #37 from dmilisav/master

Latest fixes for trainer tool.