Merge pull request #121 from arpitgupta/master

Revert "Merge pull request #119 from arpitgupta/master"