Added death
Merge branch 'develop'