diff --git a/README.rst b/README.rst
index 5d351980b..4a19a91d5 100644
--- a/README.rst
+++ b/README.rst
@@ -81,6 +81,19 @@ you can now build the tests and run them::
     $ make
     $ make test
 
+You can also download and install cpp-netlib using the ` vcpkg`_ dependency manager:
+    
+    $ git clone https://github.com/Microsoft/vcpkg.git
+    $ cd vcpkg
+    $ ./bootstrap-vcpkg.sh
+    $ ./vcpkg integrate install
+    $ vcpkg install cpp-netlib
+    
+The cpp-netlib port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please create an issue or pull request on the ` vcpkg`_ repository.
+
+.. _`vcpkg`: https://github.com/Microsoft/vcpkg
+
+
 If for some reason some of the tests fail, you can send the files in
 ``Testing/Temporary/`` as attachments to the cpp-netlib `developers mailing
 list`_.
diff --git a/boost/network/protocol/http/policies/async_resolver.hpp b/boost/network/protocol/http/policies/async_resolver.hpp
index c03cd5a36..4e508364a 100644
--- a/boost/network/protocol/http/policies/async_resolver.hpp
+++ b/boost/network/protocol/http/policies/async_resolver.hpp
@@ -36,18 +36,21 @@ struct async_resolver : std::enable_shared_from_this<async_resolver<Tag> > {
   typedef std::function<void(resolver_type &, string_type, std::uint16_t,
                              resolve_completion_function)> resolve_function;
 
+  void clear_resolved_cache() { clear_cache_.store(true); }
+
  protected:
   bool cache_resolved_;
+  std::atomic<bool> clear_cache_;
   endpoint_cache endpoint_cache_;
   std::shared_ptr<boost::asio::io_service> service_;
   std::shared_ptr<boost::asio::io_service::strand> resolver_strand_;
 
   explicit async_resolver(bool cache_resolved)
-      : cache_resolved_(cache_resolved), endpoint_cache_() {}
+      : cache_resolved_(cache_resolved), clear_cache_(false), endpoint_cache_() {}
 
   void resolve(resolver_type &resolver_, string_type const &host,
                std::uint16_t port, resolve_completion_function once_resolved) {
-    if (cache_resolved_) {
+    if (cache_resolved_ && !clear_cache_.load()) {
       typename endpoint_cache::iterator iter =
           endpoint_cache_.find(boost::to_lower_copy(host));
       if (iter != endpoint_cache_.end()) {
@@ -74,6 +77,9 @@ struct async_resolver : std::enable_shared_from_this<async_resolver<Tag> > {
     typename endpoint_cache::iterator iter;
     bool inserted = false;
     if (!ec && cache_resolved_) {
+      if (clear_cache_.exchange(false)) {
+        endpoint_cache_.clear();
+      }
       std::tie(iter, inserted) = endpoint_cache_.insert(std::make_pair(
           host, std::make_pair(endpoint_iterator, resolver_iterator())));
       once_resolved(ec, iter->second);
diff --git a/boost/network/protocol/http/policies/sync_resolver.hpp b/boost/network/protocol/http/policies/sync_resolver.hpp
index 7c9c2c7f4..09d373b87 100644
--- a/boost/network/protocol/http/policies/sync_resolver.hpp
+++ b/boost/network/protocol/http/policies/sync_resolver.hpp
@@ -27,19 +27,26 @@ struct sync_resolver {
   typedef std::pair<resolver_iterator, resolver_iterator>
       resolver_iterator_pair;
 
+  void clear_resolved_cache() { clear_cache_.store(true); }
+
  protected:
   typedef typename string<Tag>::type string_type;
   typedef std::unordered_map<string_type, resolver_iterator_pair>
       resolved_cache;
   resolved_cache endpoint_cache_;
   bool cache_resolved_;
+  std::atomic<bool> clear_cache_;
 
-  explicit sync_resolver(bool cache_resolved) : cache_resolved_(cache_resolved) {}
+  explicit sync_resolver(bool cache_resolved)
+      : cache_resolved_(cache_resolved), clear_cache_(false) {}
 
   resolver_iterator_pair resolve(resolver_type& resolver_,
                                  string_type  /*unused*/const& hostname,
                                  string_type const& port) {
     if (cache_resolved_) {
+      if (clear_cache_.exchange(false)) {
+        endpoint_cache_.clear();
+	  }
       typename resolved_cache::iterator cached_iterator =
           endpoint_cache_.find(hostname);
       if (cached_iterator == endpoint_cache_.end()) {
diff --git a/boost/network/protocol/stream_handler.hpp b/boost/network/protocol/stream_handler.hpp
index 62c97ec4a..cd98b6875 100644
--- a/boost/network/protocol/stream_handler.hpp
+++ b/boost/network/protocol/stream_handler.hpp
@@ -13,12 +13,12 @@
 #include <memory>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/basic_socket.hpp>
+#include <boost/asio/basic_stream_socket.hpp>
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/handler_type_requirements.hpp>
 #include <boost/asio/detail/push_options.hpp>
 #include <boost/asio/detail/throw_error.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/asio/stream_socket_service.hpp>
 #include <cstddef>
 
 #ifdef BOOST_NETWORK_ENABLE_HTTPS
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
index 0031f3a53..e647a8e69 100644
--- a/libs/network/example/CMakeLists.txt
+++ b/libs/network/example/CMakeLists.txt
@@ -5,6 +5,7 @@
 
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 include_directories(${CPP-NETLIB_SOURCE_DIR}/deps/cxxopts/src)
+include_directories(${CPP-NETLIB_SOURCE_DIR}/deps/cxxopts/include)
 if (OPENSSL_FOUND)
   include_directories(${OPENSSL_INCLUDE_DIR})
 endif (OPENSSL_FOUND)
diff --git a/libs/network/example/http_client.cpp b/libs/network/example/http_client.cpp
index 439176192..1a717805c 100644
--- a/libs/network/example/http_client.cpp
+++ b/libs/network/example/http_client.cpp
@@ -29,22 +29,22 @@ int main(int argc, char* argv[]) {
     ;
 
   options.parse_positional(std::vector<std::string>{"source"});
-  options.parse(argc, argv);
+  auto optionsResults = options.parse(argc, argv);
 
-  if (options.count("help")) {
+  if (optionsResults.count("help")) {
     std::cout << options.help({"", "Group"}) << std::endl;
     return EXIT_SUCCESS;
   }
 
-  if (options.count("source") < 1) {
+  if (optionsResults.count("source") < 1) {
     std::cout << "Error: Source URL required." << std::endl;
     std::cout << options.help({"", "Group"}) << std::endl;
     return EXIT_FAILURE;
   }
 
-  std::string source = options["source"].as<std::string>();
-  bool show_headers = options.count("headers") ? true : false;
-  bool show_status = options.count("status") ? true : false;
+  std::string source = optionsResults["source"].as<std::string>();
+  bool show_headers = optionsResults.count("headers") ? true : false;
+  bool show_status = optionsResults.count("status") ? true : false;
 
   http::client::request request(source);
   http::client::string_type destination_ = host(request);
diff --git a/libs/network/src/server_request_parsers_impl.cpp b/libs/network/src/server_request_parsers_impl.cpp
index 9a539b1ae..d3670e924 100644
--- a/libs/network/src/server_request_parsers_impl.cpp
+++ b/libs/network/src/server_request_parsers_impl.cpp
@@ -12,6 +12,7 @@
 #include <boost/spirit/include/qi.hpp>
 #include <boost/fusion/adapted/std_tuple.hpp>
 #include <boost/network/protocol/http/message/header.hpp>
+#include <boost/regex/pending/unicode_iterator.hpp>
 
 namespace boost {
 namespace spirit {
@@ -22,7 +23,7 @@ typedef std::basic_string<uint32_t> u32_string;
 template <>  // <typename Attrib, typename T, typename Enable>
 struct assign_to_container_from_value<std::string, u32_string, void> {
   static void call(u32_string const& val, std::string& attr) {
-    u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(),
+    boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(),
                                                    end = val.end();
     for (; begin != end; ++begin) attr += *begin;
   }