Pull Gavin's changes to help repair the package into SimonGoring