Merge pull request #19 from EricpolUkraine/development

Merge from ajour\development
Issue #380 completed.  GetUsersOnlyData fixed.
Merge pull request #390 from nazariitashak/development

Issue #380 completed