Fix #17
Add Peer Exchange