Issue #95 solved