refactoring code
Merge branch 'AlexDenisenko' into develop