Wintermute Rotozoom-review Pull-Request.

I'm opening a pull-request from your branch to my repos, to allow for easier commenting.