I have attached a Patch and addressed the issue of #36 by lauriii.
Please re...