I’ve submitted pull request #21 to the mainline. This patch addresses the bug that I filed a couple days ago. If there are any issues with the patch, please let me know so that I can fix them as soon as possible. We’re currently hosting my patch on an internal repository, but would like to switch back to the mainline as soon as possible.