Final tweak.
Merge pull request #86 from roydude/v1-train

Final tweak.