Issue #99 solved