Finalised 26854.
Merge pull request #142 from roydude/v1-train

Finalised 26854.