Fixing #22 , Thanks @mudithaj for the patch