Fix for issue #89
Merge pull request #92 from NiteshKant/FixForIssue90

Fix for issue #89