Issue #107 solved