Issue #108 solved