Hello Amin,

>
> Thanks for your patch, Leon.  I've left some stylistic comments below,
> until I get a chance to have a closer look at your patch and take it for
> a test run in the next week or so. :-)
>

Thanks for the pointers. I attached a new patch with all of them addressed.