add die functionality
Merge branch 'die'