Adjusted 26845.
Improved 27753.
Merge pull request #144 from roydude/v1-train

v1train