Merge pull request #280 from danvk/kill-code