Issue #16 solved.