Issue #9 solved