Fixing ISSUE#35
Merge pull request #36 from gurumvg/ISSUE#35

Fixing ISSUE#35