~9% code reduction, cleanup, testing, version bump
Merge pull request #3 from invisiblefriend/develop

~9% code reduction, cleanup, testing, version bump