fetch and merger remote tracking branch
changes after code review
Merge pull request #96 from jenananthan/master

Changes after code review