Thanks Josh, I was already aware of that thread :)

Stefan, attached is a new patch with your suggestions included.

Regards,
Gian