Vereshchagina, fix 20, 21. New 16
Merge branch 'master' of https://github.com/gsvgit/142_13_1
Merge branch 'master' of https://github.com/gsvgit/142_13_1