0.4.1, added fix by alucryd