Merge pull request #6 from maharshipatel999/master

Merge master into tushar