I just merged @choucalate's patch.