Merge branch '42-test-ollavrova#3'