Merge pull request #1179 from ludovic-henry/pr25-threadpool