Code review 2
Merge pull request #2 from sarvsav/master

Code review 2