as per suggestion in #10 . Made the changes. Adding the patch. Please review ...