Merge pull request #1 from EricpolUkraine/development

Development
Issue #218 and #219 were fixed
Merge pull request #221 from nazariitashak/development

Issue #218 and #219 were fixed