add suggested merge! from Samsinite