Revert "Merge pull request #19 from gaich/patch-6"

This reverts commit cf232f1b21e886795869806cbaa37a00110c4181, reversing
changes made to d26a5827cbf651b73b1f34d00024e089d65f9aed.
Revert "Merge pull request #18 from gaich/patch-5"

This reverts commit d26a5827cbf651b73b1f34d00024e089d65f9aed, reversing
changes made to 0740ee133d6eebe4232fe15098070876a3548eb6.
Revert "Merge pull request #17 from gaich/patch-4"

This reverts commit 0740ee133d6eebe4232fe15098070876a3548eb6, reversing
changes made to 9e74509d7908f548d713484482dcbf592c6ee4bf.