Hi,

Thank you Timo for the review. Took your suggestions, updated patch attached.

Thanks,
Kyle