Feature/fix issue 2

Administratorrequested to merge
feature/fix_issue-2 into develop

Merge request reports