Allowed things to die
Merging with master