Issue #110 Implementation