Abstract being killed, items that can die must now implment killed function
Merge remote-tracking branch 'origin/master'