Sorted out 26352
Merge pull request #216 from roydude/v1-train

Sorted out 26352