Added peer to peer client and server.
Merge fix