added support for vmware
Merge remote-tracking branch 'origin'