Hi Hardy,

Agreed on your comments. I will try to submit a patch request soon. Thanks for looking at it rather soon!