homework
Merge pull request #1 from yegoryeshchenko/dev

homework