Trying to merge in the official changes

I'm not entirely sure if I'm doing this right to pull it into my repository (I don't use github that often)