Issue #8 completed implementation