Merging my fork into master