I've actioned this in pull request #385 - particularly edcd5aa