Fixes #7. Relates to #6.