Modified IClient and IServer
Merge origin/master