to fix problem with merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from AnnaSkachkauskaite/master

merge