Issue #10 and #4