Issue #74 solved