Revert "Merge pull request #10 from darnould/a_feature_1"

This reverts commit c7a24d8105eb426801844687201beef1058c631d, reversing
changes made to 3a6a8d0a123a9c07e33d211552ec93f205f89738.