Add dev fixes #3
Merge pull request #4 from theaspect/kill_list

Add dev fixes #3