Fixed Issue #20