Hey Ludo!

Thanks for the ping and sorry for the delay!

I hope, this patch is better/pushable ;)