Issue #110 solved