Our local fixes to your plugin

Hi,

Our local fixes to your plugin we hope you can include before the upcoming release.

Regards,
Tim