added client and server listerner
Merge branch 'master' into network