Updated to be compatible with Devristo/tribler devel