Merge pull request #68 from carlosmartineztoral/v1-train

Fixed 4711 to use SHORT number
Added test 6036