fixes #3

pull request from kill_list to master
Awesome job! Go ahead and merge this back into master.