Issue #7 solved.