Chrisjenkins

Here's my branch with Pete's fix...