Issue #565 fixed.
Merge pull request #566 from nazariitashak/development

Issue #565 fixed.