Hello,

New patch rebased on current master attached.

Cheers,

--
     Florin Irion