A commit from RJS

Code was actually edited in the browser at github rather than copying back to my local machine.