update Iss21

issue #21. Was created and left without much. Therefore it needs to be updated with this pull request.