Merge pull request #34 from EricpolUkraine/development

from Ajour\development
Issue #588 fixed
Merge pull request #590 from nazariitashak/development

Issue #588 fixed