OM NOM NOMNOMONOMONOMNOMONOMONOM

Titus told me to.
Merge pull request #1 from kkskeate/master

Take it!
Merge pull request #1 from cleichner/master

Lots of very serious software.