Fixed Issue #10 and #7