Merge pull request #24 from roydude/v1-train

V1 train
Took thread removal out of 19420 (not necessary and sometimes fails).