Pulled from upstream
Merge pull request #3 from rajiprinze/master

Pulled from upstream