Robust kill

Please merge #15 before this PR.