Added a few comments
Some change
Commiting to avoid conflict with upstream
Adding back welcome changes so that it can be pushed upstream
Merge pull request #16 from vandanabhat/master

Added a few comments