Issue #10 in progress