Issue #113 solved