Hi Johan/Marcel, 

Attaching the updated Plugin patch.
Let me know what you think.

-Alok.