Random changes
Merge pull request #1 from ehanschen/master

Bloody brilliance!