Issue #86 solved