Tried to clean up your !159 (closed) a bit (rebased on current master and squashed the commits a bit, I think that it looks a lot tidier and is easier to understand that way).