Revert "Merge pull request #89 from reecefowell/master"

This reverts commit 61f87d072058b5d791803ad1fc9cfdfe83cd092e, reversing
changes made to 3275e8aacaf369dd1df3867a22c4454e54436746.
Merge pull request #94 from todc/revert_pull_request_89

Revert "Merge pull request #89 from reecefowell/master"
Merge remote-tracking branch 'upstream/master'