Fixes #6

Issue #8