diff --git a/file_server/file_server.vcproj b/file_server/file_server.vcproj
index 666c710c538a57cd5aa7ed81404fde5ce2e2f697..edc62036460aee63f8315840dd27106cc6fb5e22 100644
--- a/file_server/file_server.vcproj
+++ b/file_server/file_server.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_PASSIVE_RECV;ST_ASIO_AVOID_AUTO_STOP_SERVICE;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_PASSIVE_RECV;ST_ASIO_AVOID_AUTO_STOP_SERVICE;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -189,7 +189,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_PASSIVE_RECV;ST_ASIO_AVOID_AUTO_STOP_SERVICE;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -264,7 +264,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;BOOST_ASIO_NO_DEPRECATED;ST_ASIO_RESTORE_OBJECT;ST_ASIO_SERVER_PORT=5051;ST_ASIO_START_OBJECT_ID=500;ST_ASIO_PASSIVE_RECV;ST_ASIO_AVOID_AUTO_STOP_SERVICE;ST_ASIO_WANT_MSG_SEND_NOTIFY;ST_ASIO_INPUT_QUEUE=non_lock_queue;ST_ASIO_RECV_BUFFER_TYPE=std::vector&lt;boost::asio::mutable_buffer&gt;;ST_ASIO_SCATTERED_RECV_BUFFER;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/include/config.h b/include/config.h
index 27f455387ad70c645e8a05c61dc084f317f39d08..96c9c097f0ef6df07d2f59101349ba9ff5e4b223 100644
--- a/include/config.h
+++ b/include/config.h
@@ -884,6 +884,8 @@
  *  socket::send_msg().
  * Fix -- basic_buffer doesn't support fixed arrays (just in the constructor) in GCC and Clang.
  * Fix ssl graceful shutdown monitoring.
+ * Fix msvc++'s complaint -- ambiguous namespace proxy.
+ * Close connected UDP for normal UDP (to support receiving messages from multipile peers).
  *
  * ENHANCEMENTS:
  * heartbeat(ext) optimization.
@@ -901,6 +903,7 @@
  *
  * REFACTORING:
  * Add some default implementations for i_matrix interface, which is useful for a dummy matrix.
+ * Refactoring of callback mechanism.
  *
  * REPLACEMENTS:
  *