bug squashing :D
Merge branch 'blind' of github.com:/blackchair/helena into blind