Added @calvin's patch to Simplero's fork

Test to follow