Merge pull request #234 from nhr/master

Mods to improve the VM experience