Done, but I can't figure out how to make the pull request reflect it though I've pushed it to master.