added issue50 to testing branch