Merge pull request #189 from roydude/v1-train

v1train
Merge pull request #190 from roydude/v1-train

v1train