Issue #67 solved