Hi,

I implemented the changes we discussed so we can finally close this ticket.
Patches are attached.

Tim.