Fast-forwarding to latest version, fixed conflict

Updating your fork to the latest version, fixed conflict that arose, fixed accidental tab indentation.