Wanting to update my fork to latest master

I hope I'm doing this correctly