Add timetaker
maybe fix segfault
Merge remote-tracking branch 'upstream/master' into next