Master.1

Happy to merge these changes into the master branch, as they don't break anything.