WAITING tasks can be killed now

fixes #168
Merge remote-tracking branch 'origin/master'