peer checking againt by key ring
fix conflics
Merge pull request #188 from matiu/feature/peer-checking

Feature/peer checking