homework
Merge pull request #35 from s0tiroff/master

homework