Update master fork with latest updates