Homeworks
Merge branch 'changes'