Issue #466 completed
Merge pull request #494 from nazariitashak/development

Issue #466 completed