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

Fixes.