Issue #22 completed