Merge dev/feature/refactoring request #7

Closed vladislavs-poznaks closed 1 year ago