Do cool stuff
Merge pull request #145 from bholzer/master

Do cool stuff