Issue #22 solved