Fixes
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice into develop