Fix bug #88
Fix vm name in func
Merge pull request #1 from retspen/master

sync to upstream.