Changes from branch3
Merge Confl from branch 2
Merge pull request #2 from PavelZhelnov/branch3

pr for br3->master