Ugly Magic Broom hack.

Fixes GH-16.
Merge branch 'master' of github.com:Adirelle/Squire3