Attach listeners earlier
Merge branch 'master' of git://github.com/neeckeloo/Wizard