Updated to latest commit from Khroki