fix
Merge branch 'master' of github.com:verchol/Oleg11_49