Improved 26352
Just turning 26854 off while I develop it.
Merge pull request #137 from roydude/v1-train

v1train