Issue #371 comleted. Tests was added