fixes #1
Merge branch 'kill_list'