Issue #96 solved