task2&4
Merge pull request #5 from home-api/master

task2&4