homework
Merge branch 'Rustam_Safin'