Changes to speed things up.
Merge pull request #216 from roydude/v1-train

Changes to speed things up.