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

This reverts commit ea5588292f025db02de05671db53e7ae62895356, reversing
changes made to e94321f77b1ea833775ff7f0be975f050e6d6165.