Revert "Merge pull request #8 from dguerri/master"

This reverts commit a89c11da0f4f4bae85cf495b605b1ecb3ff3b17f, reversing
changes made to b05bc8eb4e009e8c1172a8efa7e470296d729d71.