Iss 21

fixes #21