Merge pull request #6 from spokkal/master

pulling from master to s
Merge pull request #7 from spokkal/Shilpa-feature-branch

Merge pull request #6 from spokkal/master