Kill list

Merge branch into the master