Issue #517 completed.
Merge pull request #524 from nazariitashak/development

Issue #517 completed.