Update/fix Broomstick
Merge pull request #3181 from alebcay/broomstick

Update/fix Broomstick