merged with ps-cancel

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>