Merge pull request #244 from klynton/master

Fixes TRAINVM-73