Revert "Merge pull request #30 from eriCCChaos/develop"

This reverts commit 8709af99d2c5ebf4963056eb4365c07901927f40, reversing
changes made to c3c9d905a0fc119a37b866bcdb0d40b2fae9259e.