Added listening for incoming peers
Merging