28 Apr 2016 Modified patch to clear some more issues. Thanks for the patch. Anish A. Code contributions
