Pull request from Kill_list to master

Because you asked for it.