Merge pull request #44 from boudewijn-tribler/bugfixes

Fixes StandaloneEndpoint inheritance bug.