resolved conflict
tmp fix
Merge pull request #21 from RWOverdijk/hotfix/threadMessages

Hotfix/thread messages