Fix #129

Pull develop and try it now @popwarfour