Hi Ludo,

thanks for the review!  Does that mean that I should push to shepherd?

If not, new patch attached :)