Changes by Pawan
Merge pull request #7 from siddharthjn/pawan-changes

Changes by Pawan