Revert "Merge pull request #33 from ccgjosh/develop"

This reverts commit b9dc3f93d5876133a48ca0474f6d204fa5ddf9d8, reversing
changes made to 6bea4f4827b465cdd7467c691e5b28918937208e.