Modified to fix ISSUE #41
Merge pull request #42 from gurumvg/ISSUE#41

Modified to fix ISSUE #41