Iss54

please merge to release