Issue #51 implementation