Merging new changes back to my fork