Revert "Merge pull request #3 from howardgrigg/small-fixes"

This reverts commit ee6ae7b437837a2f1dbb3beea4516b254c319157, reversing
changes made to 32e93d2128fa638d377873e8a03a84104b2092c2.