Pull Request for the sixth issue

Fixes #6