Upstream changes #2
Description
There were some small changes to this fork done during this hackathon. Those changes should be upstreamed, if they are good enough. If they are not, we need to either improve them, or think of a better way of doing things.