Alexanders task and main
Merge branch 'develop' into sort_khartsyzov