updating fork to current master

I think I have to do this first