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

Fixes.