Merge pull request #1 from nitishkrishna/master

Updated codebase