Hi,

Apologies for delay and thank you for the patch!

Pushed to master as 9ac2a4ee3424dd216b1b67056968e0585197952a with
following changes: