Still trying to make 26467 bulletproof.
Merge pull request #160 from roydude/v1-train

Still trying to make 26467 bulletproof.