diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d163863
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
\ No newline at end of file
diff --git a/windows/build-lib.cmd b/windows/build-lib.cmd
index 5d5bf1a..93c5248 100644
--- a/windows/build-lib.cmd
+++ b/windows/build-lib.cmd
@@ -8,14 +8,14 @@ SET MYDIR=%~dp0
 SET BUILDARCH=%1
 SET BUILDTYPE=%2
 SET VSVERSION=%3
-SET INSTALLPATH=%4
+SET INSTALLPATH=%~4
 IF [%4] == [] GOTO missingparams
 
 SET BUILDTARGET=%INSTALLPATH%\cmake\%BUILDARCH%
 SET TARGET=%INSTALLPATH%\%BUILDARCH%
 
-call %MYDIR%..\support\windows\cmake\generate.cmd %BUILDARCH% nmake %MYDIR%..\ %BUILDTARGET% %TARGET% %BUILDTYPE% %VSVERSION% static
-call %MYDIR%..\support\windows\cmake\build.cmd %BUILDARCH% %BUILDTARGET% %VSVERSION%
+call "%MYDIR%..\support\windows\cmake\generate.cmd" %BUILDARCH% nmake "%MYDIR%.." "%BUILDTARGET%" "%TARGET%" %BUILDTYPE% %VSVERSION% static
+call "%MYDIR%..\support\windows\cmake\build.cmd" %BUILDARCH% "%BUILDTARGET%" %VSVERSION%
 goto exit
 
 :missingparams
diff --git a/windows/build.cmd b/windows/build.cmd
index 1f796a6..7fc16d3 100644
--- a/windows/build.cmd
+++ b/windows/build.cmd
@@ -6,13 +6,13 @@ SETLOCAL
 
 SET MYDIR=%~dp0
 SET BUILDTYPE=Release
-SET VSVERSION=12
+SET VSVERSION=16
 SET INSTALLPATH=%MYDIR%..\build
 
-rmdir %MYDIR%..\build /s /q
+rmdir "%MYDIR%..\build" /s /q
 
 for %%T in (amd64 x86) do (
-  call %MYDIR%\build-lib.cmd %%T %BUILDTYPE% %VSVERSION% %INSTALLPATH%
+  call "%MYDIR%\build-lib.cmd" %%T %BUILDTYPE% %VSVERSION% "%INSTALLPATH%"
 )
 
-rmdir %MYDIR%..\build\cmake /s /q
+rmdir "%MYDIR%..\build\cmake" /s /q