Resolve Issue #9 and Issue #10