Incorporated review comments
Merge pull request #3 from ankit21a/master

Incorporated review comments