diff --git a/.appveyor.yml b/.appveyor.yml
index 87ff9390..7b711715 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -20,8 +20,8 @@ before_build:
   - git submodule update --init
   - mkdir build
   - cd build
-  - cmake .. -G "NMake Makefiles" 
-  - nmake
+  - cmake .. -G "Visual Studio 15 2017" 
+  - cmake --build . --target ALL_BUILD --config Debug
 
 build_script:
   - cd ..
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 2c38fca2..5fd19dae 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -86,16 +86,16 @@ find_path(MYSQL_INCLUDE_DIR
     /usr/local/include
     /usr/local/include/mysql
     /usr/local/mysql/include
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include"
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/include"
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/include"
-    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/include"
-    "${PROGRAM_FILES_64}/MySQL/include"
     "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/include"
     "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/include"
     "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/include"
     "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/include"
     "${PROGRAM_FILES_32}/MySQL/include"
+    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include"
+    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/include"
+    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/include"
+    "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/include"
+    "${PROGRAM_FILES_64}/MySQL/include"
     "C:/MySQL/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include"
@@ -142,15 +142,6 @@ if( WIN32 )
       libmysql
     PATHS
       ${MYSQL_ADD_LIBRARIES_PATH}
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib/opt"
-      "${PROGRAM_FILES_64}/MySQL/lib"
       "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib"
       "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib"
       "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib"
@@ -160,6 +151,15 @@ if( WIN32 )
       "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib/opt"
       "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib/opt"
       "${PROGRAM_FILES_32}/MySQL/lib"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib/opt"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib/opt"
+      "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib/opt"
+      "${PROGRAM_FILES_64}/MySQL/lib"
       "C:/MySQL/lib/debug"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib"
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib"
@@ -223,15 +223,6 @@ endif( UNIX )
 if( WIN32 )
     find_program(MYSQL_EXECUTABLE mysql
       PATHS
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin/opt"
-        "${PROGRAM_FILES_64}/MySQL/bin"
         "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin"
         "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin"
         "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin"
@@ -241,6 +232,15 @@ if( WIN32 )
         "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin/opt"
         "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin/opt"
         "${PROGRAM_FILES_32}/MySQL/bin"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin/opt"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin/opt"
+        "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin/opt"
+        "${PROGRAM_FILES_64}/MySQL/bin"
         "C:/MySQL/bin/debug"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin"