Changes after code review v1
Merge pull request #97 from jenananthan/master

Changes after code review v1