Fixes #12
Issue #5