Jon Rimmer, if you'll notice there is a pull request I've done that I am going to go back over today. The bulk of the work is done and my hope is to try and get this included in the next 5.2.x release.