Bugs must die
Merge pull request #43 from the12chairs/last_steps

Bugs must die