Feature/no double kill

Closes #249.