bug fix
Merge branch 'thread_pool'