Best pull request ever

Though it only has one commit for now :(
More coming, eventually! Probably!

Commits described within themselves.