Merge pull request #2 from Libwella/master

I have no idea what I'm doing, really
Merge pull request #11 from BenjaminSterling/master

Merge pull request #2 from Libwella/master