Pull Request for Issue 6

Fixes #6