Merge pull request #1 from Patroklo/master

Your code is wrong, and you should be ashamed about that!
Nobody error_unexpects the spanish inquisition.
Merge pull request #1 from jeroen/master

derp