world -> valery
master merged to valery and conflicts resolved