Issue #3 solved