Fast-forwarding to latest version, fixed conflict

GitHub is weird, I have no idea if I'm even doing this right.

Updating your fork to the latest version, fixed conflict that arose, fixed accidental tab indentation.