Merge pull request #3 from nikunjlahoti/master