Merge pull request #18 from ashish343/sjain7

Sjain7
merging conflict