Sprint 9 Fixes #130

Closed AndreiUkladchikov closed 1 year ago