I hope someone picks up this pull request