Hi Ori,

Thanks for the feedback. Here is an amended version of the patch.

Regarding your last point, I'll try to look into it in the upcoming weeks.

Regards,
Philippe