diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed06a78..6313af0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.3)
         message(FATAL_ERROR "Clang version >=3.3 required.")
     endif()
-elseif (MSVC14)
+elseif (MSVC14) #TODO: What about other MSVC versions?
 else()
     message(WARNING "Your compiler (${CMAKE_CXX_COMPILER_ID}) has not been tested on this project. Only Clang and GCC has been tested. Please report any problems at the project page on GitHub.")
 endif()
@@ -20,8 +20,7 @@ include_directories(.)
 
 find_package(Threads REQUIRED)
 
-#Only tested with versions 1.59.0
-find_package(Boost 1.59.0 COMPONENTS regex system thread coroutine context filesystem date_time REQUIRED)
+find_package(Boost 1.54.0 COMPONENTS regex system thread coroutine context filesystem date_time REQUIRED)
 include_directories(${Boost_INCLUDE_DIR})
 
 if(APPLE)
@@ -29,7 +28,7 @@ if(APPLE)
 endif()
 
 #TODO: add requirement for version 1.0.1g (can it be done in one line?)
-find_package(OpenSSL QUIET)
+find_package(OpenSSL)
 
 if(OpenSSL_FOUND)
     include_directories(${OPENSSL_INCLUDE_DIR})
@@ -44,7 +43,7 @@ add_executable(http_examples http_examples.cpp)
 target_link_libraries(http_examples ${Boost_LIBRARIES})
 target_link_libraries(http_examples ${CMAKE_THREAD_LIBS_INIT})
 
-if(MSYS)
+if(MSYS) #TODO: Is MSYS true when MSVC is true?
     target_link_libraries(http_examples ws2_32 wsock32)
     target_link_libraries(https_examples ws2_32 wsock32)
 endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 27a7cff..2bf0b85 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(parse_test parse_test.cpp)
 target_link_libraries(parse_test ${Boost_LIBRARIES})
 target_link_libraries(parse_test ${CMAKE_THREAD_LIBS_INIT})
 
-if(MSYS)
+if(MSYS) #TODO: Is MSYS true when MSVC is true?
     target_link_libraries(parse_test ws2_32 wsock32)
 endif()