Issue #5
Fixes #28