Issue #102 solved