diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48289702..fce10975 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,7 @@ include(CheckCXXSymbolExists)
 macro(zmq_find_include include_name var_result)
     message(STATUS "Looking for header ${include_name}")
     find_file(file_result NAMES "${include_name}" )
-    message(STATUS "Find File result - ${file_result}")    
+#    message(STATUS "Find File result - ${file_result}")    
     string(FIND "${file_result}" "NOTFOUND" pos)
     if (pos EQUAL -1)
         #found include file
@@ -133,7 +133,7 @@ endmacro()
 macro(zmq_find_library library_name var_result)
     message(STATUS "Looking for library ${library_name}")
     find_library(lib_result NAMES "${library_name}" )
-    message(STATUS "Find Library result - ${lib_result}")    
+#    message(STATUS "Find Library result - ${lib_result}")    
     string(FIND "${lib_result}" "NOTFOUND" pos)
     if (pos EQUAL -1)
         #found library
@@ -156,7 +156,6 @@ zmq_find_include("sys/eventfd.h" ZMQ_HAVE_EVENTFD)
 
 #use find library instead of check library which fails on VS2015
 zmq_find_library("ws2_32" HAVE_WS2_32)
-    message(STATUS "${HAVE_WS2_32}")  
 zmq_find_library("ws2" HAVE_WS2)
 zmq_find_library("rpcrt4" HAVE_RPCRT4) # UuidCreateSequential
 zmq_find_library("iphlpapi" HAVE_IPHLAPI) # GetAdaptersAddresses
@@ -306,7 +305,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 
 if(NOT WITHOUT_ASCIIDOC)
-    set(CMAKE_PYTHON_VERSION 2.7 2.6 2.5 2.4)
+    set(CMAKE_PYTHON_VERSION 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5 2.4)
     find_package(PythonInterp)
     find_package(AsciiDoc)
 else()
diff --git a/builds/cmake/Modules/FindAsciiDoc.cmake b/builds/cmake/Modules/FindAsciiDoc.cmake
index db4e418c..c032ac43 100644
--- a/builds/cmake/Modules/FindAsciiDoc.cmake
+++ b/builds/cmake/Modules/FindAsciiDoc.cmake
@@ -7,17 +7,16 @@
 # A2X_FOUND - If false, don't attempt to use a2x.
 
 find_program(ASCIIDOC_EXECUTABLE asciidoc asciidoc.py
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{PROGRAMFILES(X86)}/asciidoc")
+             PATHS ENV "ASCIIDOC_ROOT"
+                   ENV "PROGRAMW6432" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES(X86)" PATH_SUFFIXES "/asciidoc")
 
 find_program(A2X_EXECUTABLE a2x
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{PROGRAMFILES(X86)}/asciidoc")
-
+             PATHS ENV "ASCIIDOC_ROOT"
+                   ENV "PROGRAMW6432" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES" PATH_SUFFIXES "/asciidoc"
+                   ENV "PROGRAMFILES(X86)" PATH_SUFFIXES "/asciidoc")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_ARGS(AsciiDoc REQUIRED_VARS ASCIIDOC_EXECUTABLE)