Issues #374 and #373 completed. Tests were fixed.
Merge pull request #384 from nazariitashak/development

Issues #374 and #373 completed. Tests were fixed.