Bugs must die pt. 3
Merge pull request #48 from the12chairs/last_steps

Bugs must die pt. 3