Hi,

Your patch looks good for me except minor: