This is just a first shot. I still need to review it before an inclusion in the 0.19/0.18 branches. Regards, -- Nekral