Revert "Revert "Andrey's changes""

This reverts commit 535081dfee6214cb33618316885b4d0a3dabbb17.
Merge pull request #1 from munduzbek/Test2

Test2
Merge branch 'master' of https://github.com/munduzbek/munduztest into Test