Merge pull request #107 from it-workshop/wp/CAROLINE-28/1

CAROLINE-28: Multithreading.
(cherry picked from commit 1b8b4a1186866146205271093dcacf1a4674bb72)
Merge pull request #120 from it-workshop/wp-1.0.0/CAROLINE-28/1

Merge pull request #107 from it-workshop/wp/CAROLINE-28/1