merge oklong from openvix/enigma2