Fixed pendu
Merge branch 'staging'
Death behaves the right way now