Oh derp
Merge pull request #34 from KittyTristy/master

Oh derp