refactoring
Merge remote-tracking branch 'origin/master'
Revert "Merge branch 'master' of C:\Infotex with conflicts."

This reverts commit ab758289855dde4ae001dc1d76efc9df8cf346d5.
corrected Sasha's commit