Issue #4 solved