Hi Lucas

Thanks for your comments.
Please find the patch, with suggested changes.

Thanks
Pradeep