Merge branch 'master' of github.com:shoumikhin/NSXtensions