Issue #7 completed.