Merge pull request #36 from roydude/v1-train

Fixed 6050.
test 6057
Merge pull request #38 from RafaMarquez/v1-train

test 6057
test
test 6056