Fixed bug in hypervisor:set, added option to delete keys.
Merge branch 'test' into dev