Implement better support for multiple peer discoveries. Resolves issue 302.