Fixed problems from merging with master branch of tomp2p