Issue #403 completed.
Merge pull request #409 from nazariitashak/development

Issue #403 completed.