Addressed review comments
Merge pull request #68 from anuchandy/dev

Addressed review comments