Merge pull request #4 from madhur/develop

This reverts commit a0b299805af6ad37311869f696e292357b87651d, reversing
changes made to b2348a70d27fed6e5045cc4b3809f36d2b9f3a10.