Added drop on death
Merge branch 'ferrybig'