Merge changes into my fork