Nathan's pull request

All done!