My plugin should do what the OP has requested as @CalebJohn has rightly suggested.

Thanks for the PR. I'm away for a few days, but will look at them on my return.