Merge pull request #248 from nhr/master

Updates to better support Origin VM