Merge pull request #1 from vigneshmohankumar/dev

Initial code review