server and client connect ok
Merge branch 'serdev'