Fixes #3
Merge branch 'kill_list'