Merging in new commits to my fork