Revert "Merge pull request #6 from semuel/master"

This reverts commit 29447e480eecbb8e43ffe8307111186769e6b946, reversing
changes made to 666e2e164358b106cc5fb9bfa2dda0c2c0e0e5b8.