Changes made on the branch [kill_list] fixes #1