Issue #8

- Fixes #8