diff --git a/CMakeLists.txt b/CMakeLists.txt
index 911a70d..3c8fddb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,11 @@
 #
 # Options:
 #
-# - BUILD_SHARED (default OFF)
+# - AMQP-CPP_BUILD_SHARED (default OFF)
 #       ON:  Build shared lib
 #       OFF: Build static lib
 #
-# - LINUX_TCP (default OFF)
+# - AMQP-CPP_LINUX_TCP (default OFF)
 #       ON:  Build posix handler implementation
 #       OFF: Don't build posix handler implementation
 
@@ -94,4 +94,4 @@ endif()
 # copy header files
 install(DIRECTORY include/amqpcpp/ DESTINATION include/amqpcpp
         FILES_MATCHING PATTERN "*.h")
-install(FILES include/amqpcpp.h DESTINATION include)
\ No newline at end of file
+install(FILES include/amqpcpp.h DESTINATION include)
diff --git a/README.md b/README.md
index 22026a9..bb9bd5f 100644
--- a/README.md
+++ b/README.md
@@ -62,15 +62,19 @@ Then check out our other commercial and open source solutions:
 
 INSTALLING
 ==========
-AMQP-CPP comes with an optional Linux-only TCP module that takes care of the network part required for the AMQP-CPP core library.
+AMQP-CPP comes with an optional Linux-only TCP module that takes care of the network part required for the AMQP-CPP core library. If you use this module, you are required to link with `pthread`.
 
-There are two methods to compile AMQP-CPP: CMake and Make. CMake is platform portable, but the Makefile only works on Linux. After building there are two relevant files to include when using the library.
+There are two methods to compile AMQP-CPP: CMake and Make. CMake is platform portable, but the Makefile only works on Linux. 
+
+After building there are two relevant files to include when using the library.
 
 File|Include when?
 ----|------------
 amqpcpp.h|Always
 amqpcpp/linux_tcp.h|If using the Linux-only TCP module
 
+On Windows you are required to define `NOMINMAX` when compiling code that includes public AMQP-CPP header files.
+
 ## CMake
 The CMake file supports both building and installing. You can choose not to use the install functionality, and instead manually use the build output at `bin/`. Keep in mind that the TCP module is only supported for Linux. An example install method would be:
 ``` bash