Hello,
I have attached a patch with the requested changes.
Thanks,
vckt