Iss 90

fixes #90