Merge pull request #1 from sarvdhingra/master

merging code