Issue #8 completed