Fixed Issue #10