Revert "Merge pull request #14 from darnould/a_feature_5"

This reverts commit 452b67758d000a44f1bb7a9f7054a32b65a44d76, reversing
changes made to e87e38178855ae16035d72fac4ca3e16cedc74f0.