Yury Gaydaychuk

@mandrono ,check, please

@mandrono , take a look, please

@mandrono ?

@maxnick , @EgorDuplensky , do you have another concerns ?

@maxnick , please, review

Comments applied