fix bugs
Merge pull request #16 from ArthurStam/bumblebee

fix bugs