Issue #51 solved