diff --git a/httplib.h b/httplib.h
index aa4e3ce..f1e8d5c 100644
--- a/httplib.h
+++ b/httplib.h
@@ -265,6 +265,42 @@ private:
   std::string buffer;
 };
 
+class ThreadsTaskQueue {
+public:
+  ThreadsTaskQueue() : running_threads_(0) {}
+  ~ThreadsTaskQueue() {}
+
+  void enque(std::function<void(void)> fn) {
+    std::thread([=]() {
+      {
+        std::lock_guard<std::mutex> guard(running_threads_mutex_);
+        running_threads_++;
+      }
+
+      fn();
+
+      {
+        std::lock_guard<std::mutex> guard(running_threads_mutex_);
+        running_threads_--;
+      }
+    }).detach();
+  }
+
+  void shutdown() {
+    for (;;) {
+      std::this_thread::sleep_for(std::chrono::milliseconds(10));
+      std::lock_guard<std::mutex> guard(running_threads_mutex_);
+      if (!running_threads_) { break; }
+    }
+  }
+
+private:
+  std::mutex running_threads_mutex_;
+  int running_threads_;
+};
+
+typedef ThreadsTaskQueue TaskQueue;
+
 class Server {
 public:
   typedef std::function<void(const Request &, Response &)> Handler;
@@ -338,9 +374,7 @@ private:
   Handler error_handler_;
   Logger logger_;
 
-  // TODO: Use thread pool...
-  std::mutex running_threads_mutex_;
-  int running_threads_;
+  TaskQueue task_queue_;
 };
 
 class Client {
@@ -1890,7 +1924,7 @@ inline const std::string &BufferStream::get_buffer() const { return buffer; }
 inline Server::Server()
     : keep_alive_max_count_(CPPHTTPLIB_KEEPALIVE_MAX_COUNT),
       payload_max_length_(CPPHTTPLIB_PAYLOAD_MAX_LENGTH), is_running_(false),
-      svr_sock_(INVALID_SOCKET), running_threads_(0) {
+      svr_sock_(INVALID_SOCKET) {
 #ifndef _WIN32
   signal(SIGPIPE, SIG_IGN);
 #endif
@@ -2219,28 +2253,10 @@ inline bool Server::listen_internal() {
       break;
     }
 
-    // TODO: Use thread pool...
-    std::thread([=]() {
-      {
-        std::lock_guard<std::mutex> guard(running_threads_mutex_);
-        running_threads_++;
-      }
-
-      read_and_close_socket(sock);
-
-      {
-        std::lock_guard<std::mutex> guard(running_threads_mutex_);
-        running_threads_--;
-      }
-    }).detach();
+    task_queue_.enque([=]() { read_and_close_socket(sock); });
   }
 
-  // TODO: Use thread pool...
-  for (;;) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(10));
-    std::lock_guard<std::mutex> guard(running_threads_mutex_);
-    if (!running_threads_) { break; }
-  }
+  task_queue_.shutdown();
 
   is_running_ = false;