Pull Request for the most up-to-date code

Because the most up-to-date code has not yet been pulled to the shared remote, I am pulling it from Richard's remote instead. He has okayed this.