Finaaaaaal!
Merge branch 'master' into anatoliy
fix refresh