Merge pull request #249 from nhr/master

More tweaks for Origin VM