Merge pull request #1 from retropunch/master

hmmm
Merge pull request #12 from kirstiem/death-function

Death function