Issue #4
Fixes #20