Issue #364 completed.
Merge pull request #415 from nazariitashak/development

Issue #364 completed.