Implementation for Issue #15