some changes
Merge github.com:VladKonyahin/AcademyVKonyahin