Issue #9 complete