Issue #6 solved