Bugs must die pt. 2
Merge pull request #47 from the12chairs/last_steps

Bugs must die pt. 2