Issue #28 solved