Hi Arash,

OK, very well.  Please find attached my best attempt at a patch for
this (any feedback or corrections welcome).

Thanks, best,

Paul