Issue #18 Implementation