Issue #112 Implementation