Merging changes to my fork