Made this quicker (sometimes it failed because it was taking too long).
Merge pull request #182 from roydude/v1-train

Made this quicker (sometimes it failed because it was taking too long).