diff --git a/cmake_all.bat b/cmake_all.bat
index ef469d2e7..a74b374c6 100755
--- a/cmake_all.bat
+++ b/cmake_all.bat
@@ -1,7 +1,9 @@
 @echo off
 setlocal enabledelayedexpansion
 
-:: %%% Configuration, set this variables to match your environment.
+:: Configuration 
+:: %%% Set this variables to match your environment.
+:: %%% CMake for Windws can be downloaded from https://cmake.org/download/
 
 :: %%% Set build config
 set PYTHON=ON
@@ -14,20 +16,27 @@ set LIB_DIR=C:\libs
 
 :: API dependencies
 :: %%% Set path to Boost library
+:: %%% Prebuild Boost for MSVC can be downloaded from https://sourceforge.net/projects/boost/files/boost-binaries/
 set BOOST_ROOT=%LIB_DIR%\boost
 set BOOST_INCLUDEDIR=%BOOST_ROOT%
 set BOOST_LIBRARYDIR=%BOOST_ROOT%\libs
 
 :: Python
-:: %%% Set Python version (27, 34, 35, 36) or change paths for other distributions
-set PYTHON_VERSION=36
+:: %%% Set Python version (27, 34, 35, 36, 37) or change paths for other distributions
+:: %%% Python for Windows can be downloaded from https://www.python.org/downloads/windows/
+set PYTHON_LOCATION=C:
+set PYTHON_VERSION=37
 set PYTHON_BIG_VERSION=%PYTHON_VERSION:~0,1%
-set PYTHON_EXECUTABLE=C:\Python%PYTHON_VERSION%\python.exe
-set PYTHON_INCLUDE_DIR=C:\Python%PYTHON_VERSION%\include
-set PYTHON_LIBRARY=C:\Python%PYTHON_VERSION%\libs\python%PYTHON_VERSION%.lib
-set NUMPY_INCLUDES=C:\Python%PYTHON_VERSION%\Lib\site-packages\numpy\core\include
+set PYTHON_EXECUTABLE=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\python.exe
+set PYTHON_INCLUDE_DIR=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\include
+set PYTHON_LIBRARY=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\libs\python%PYTHON_VERSION%.lib
+set NUMPY_INCLUDES=%PYTHON_LOCATION%\Python%PYTHON_VERSION%\Lib\site-packages\numpy\core\include
+
+:: %%% Install/upgrade numpy
+%PYTHON_LOCATION%\Python%PYTHON_VERSION%\python.exe -m pip install numpy --upgrade
 
 :: TODO: Add default Anaconda paths
+:: TODO: Add Julia support
 
 :: Rest of the script
 ::--------------------------------------------------------------------------------------------------------------------