Hi Tom,

At the end, I made it :) here is the patch against current working branch.

cheers.jof