Merge branch 'patch-1' into WIZARDISHUNGRY-patch-1