Issue #595 fixed.
Merge pull request #596 from nazariitashak/development

Issue #595 fixed.