Merge branch 'saruman_thread' of https://github.com/ArthurStam/kupaka into bumblebee
Merge pull request #8 from ArthurStam/bumblebee

Merge branch 'saruman_thread' of https://github.com/ArthurStam/kupaka in...