Sorry, not the cleanest pull request, but I'm a bit new at this. Hopefully with a little tweaking it's useful!
This change is