VMware methods
Merge branch 'VMWare-methods'