правка 16.05
Merge branch 'alexey'