diff --git a/BPTCEncoder/CMakeLists.txt b/BPTCEncoder/CMakeLists.txt
index d1c0713..a21a777 100644
--- a/BPTCEncoder/CMakeLists.txt
+++ b/BPTCEncoder/CMakeLists.txt
@@ -52,11 +52,11 @@ IF( NOT HAS_INLINE_ASSEMBLY AND NOT HAS_INLINE_ASSEMBLY_WITH_FLAGS )
 ENDIF()
 
 # Check to see whether or not our compiler supports atomic operations
-IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
-	"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
+IF( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR
+	${CMAKE_C_COMPILER_ID} STREQUAL "Clang" )
   SET( COMPILER_CLANG True )
-ELSEIF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
-		"${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
+ELSEIF( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR
+		${CMAKE_C_COMPILER_ID} STREQUAL "GNU" )
   SET( COMPILER_GNU True )
 ENDIF()
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a363197..efa244a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
 PROJECT(FasTC CXX C)
 
 SET(FasTC_MAJOR_VERSION 0)
@@ -63,15 +63,17 @@ IF(MSVC)
 	SET(MSVC_INSTALL_PATH "${PROJECT_SOURCE_DIR}/Windows")
 	SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${MSVC_INSTALL_PATH}")
 
-	IF(MSVC10)
+	IF(${MSVC_VERSION} EQUAL 1600)
 		SET(MSVC_VERSION_STRING vc100)
-	ELSEIF(MSVC11)
+	ELSEIF(${MSVC_VERSION} EQUAL 1700)
 		SET(MSVC_VERSION_STRING vc110)
-	ELSEIF(MSVC12)
+	ELSEIF(${MSVC_VERSION} EQUAL 1800)
 		SET(MSVC_VERSION_STRING vc120)
-	ELSEIF(MSVC90)
+	ELSEIF(${MSVC_VERSION} EQUAL 1900)
+		SET(MSVC_VERSION_STRING vc140)
+	ELSEIF(${MSVC_VERSION} EQUAL 1500)
 		SET(MSVC_VERSION_STRING vc90)
-	ELSEIF(MSVC80)
+	ELSEIF(${MSVC_VERSION} EQUAL 1400)
 		SET(MSVC_VERSION_STRING vc80)
 	ENDIF()
 
@@ -108,6 +110,7 @@ ENDIF(TREAT_WARNINGS_AS_ERRORS)
 SET(CMAKE_MODULE_PATH "${FasTC_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH})
 FIND_PACKAGE(PVRTexLib)
 FIND_PACKAGE(BC7Export)
+FIND_PACKAGE(PNG)
 
 ######################################################################
 ##
@@ -173,7 +176,6 @@ INSTALL(
 ENABLE_TESTING()
 
 IF(MSVC)
-  MESSAGE("Setting force shared crt")
   SET(gtest_force_shared_crt TRUE CACHE BOOL "Used to properly select MSVC runtime libraries" FORCE)
 ENDIF(MSVC)
 
diff --git a/IO/CMakeLists.txt b/IO/CMakeLists.txt
index 87e89e5..d9c139f 100644
--- a/IO/CMakeLists.txt
+++ b/IO/CMakeLists.txt
@@ -67,7 +67,6 @@ ELSE()
 	SET( LINK_FLAGS -lrt ${LINK_FLAGS} )
 ENDIF()
 
-FIND_PACKAGE( PNG )
 IF( PNG_FOUND )
 	INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )
 
diff --git a/Windows b/Windows
index 6d9f6ba..90d9162 160000
--- a/Windows
+++ b/Windows
@@ -1 +1 @@
-Subproject commit 6d9f6ba0f9ebec0f6735b1f29527ea5835ef3572
+Subproject commit 90d9162aa39b5850457bcf01ae01ef916dda80b8