Once more improve echo-server example