Merge pull request #16 from boudewijn-tribler/dimitra-master

Fixes.
Merge pull request #17 from boudewijn-tribler/dimitra-master

Hack to solve malicious member bug.
Fixes.