Fixes GitHub Issue #20