Merge pull request #4 from DanielBMann9000/master

General refactoring and a few more or less pointless unit tests