Pull-request of my life

I created this pull-request today. I guess that's it: the best pull-request of my life. I'll never be able to top it.

(no functionality has been lost in the process)