Hi,

Here is a (maybe final) version of this patch.