Fix Issue #10
Fix Issue #9