Fix for issue #57
Merge pull request #58 from NiteshKant/master

Fix for issue #57