Revert "Merge pull request #15 from rushmin/master"

This reverts commit 0951416fc5ab6f0df4aef4da5afbe3a9c7fbc4a5, reversing
changes made to 74da51833f4f9b6160532415e7d89d0679685da3.