Nitish/Shruti: Bug Fixing
Merge pull request #23 from Nitishgithub/BugsFixing

Nitish/Shruti: Bug Fixing