Fix for issue #37 & #38
Merge pull request #39 from NiteshKant/master

Fix for issue #37 & #38