Merge pull request #3 from amarchandole/master

Merge pull request #6 from Nishad94/master
Merge pull request #7 from Nishad94/master

Merge pull request #3 from amarchandole/master