Revert "Merge pull request #2 from mattprecious/master"

This reverts commit bc2c4ad131c95a857602d2bd7e0e8fd73d64733e, reversing
changes made to a7380b3fb92836432d3aa42c65bd537bb64b9c50.
Revert "Revert "Merge pull request #2 from mattprecious/master""

This reverts commit 3b042c43043f26c058ab8fc3f65d8524b6fcecef.