Here's a pull request from Rob