Refactoring of the bz work
Merge pull request #31 from thescouser89/bz_fix

Refactoring of the bz work