Merging changes into my fork