Yes indeed.
I'll fix up the pull request some more later on and re-submit...