[*] Fix server/client logic.
Merge branch 'master' of github.com:ivanepifanov/Barabash