Issue #114 solved