Merging my old pull request.