Issue #45 solved