Fixed Issue #9
Fixed Issue #10