Pull request/58876b78

I'm not sure if I did this right, as its a new pull request now, but tagging is definitely a good idea!