Merge pull request #142 from jrrideout/death-march

Fix #140
Fix #144