Daniel Mendler <mail@daniel-mendler.de> writes:

> Yes, I'll send a patch and then you can take another look.

Updated patch attached to this mail.

> Daniel