Updating fork to be in sync with master