merged to koffeinflummi-master