Issue #112 solved