Improve bzbug decorator
Merge pull request #564 from elyezer/fix-bzdecorator

Improve bzbug decorator