Issue #52 implementation