Hello Florian

Please find attached patch created against latest git.

Regards, Jonny