Issue #93 solved