Updating fork with latest changes