Stuff
Merge pull request #6 from danielwerthen/master

Stuff