Merge pull request #82 from arik-so/gossip-v2-bugfixes