Revert "Merge pull request #30 from usomillp/master"

This reverts commit fb461c1966a9e1e435d24fd708603bddf008e6b0, reversing
changes made to d26d3297a93919464caf639f4419b806bd21a918.