Issues 140

fixed #140