Merge pull request #35 from roydude/v1-train

V1 train
Fixed 6050.