valera working
Merge origin/master