Revert "Merge pull request #37 from ankel/master"

This reverts commit 9115d8dce084c9b73398493e728099ea79f9480c, reversing
changes made to d2eee3c745c7deb3c7c4297f00990e601fc07cfa.
Merge pull request #42 from TeamDewberry/revert_pull_request_37

Revert "Merge pull request #37 from ankel/master"