Revert "Merge pull request #8 from ColdenCullen/master"

This reverts commit cfcd29b04ce04b44056224034fecc5d352061d42, reversing
changes made to d018782c00c4daaa7a5b272d89ff83b43df7e639.