Happy to add to the bounty, but not being a dev, I don't have a clue how to do a github pull request.