Issue #111 solved