Merge branch 'vladimir-branch'
Merge remote-tracking branch 'fun_calc_git/master' into vladimir-branch
vlad_branch_continue