merge from openvix/enigma