diff --git a/appveyor.yml b/appveyor.yml
index 85b61d0c..600fddb5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,14 +3,21 @@ image: Visual Studio 2017
 
 
 before_build:
+    - choco install winrar -y
+    - SET "PATH=%PATH%;C:\Program Files\WinRAR"
     - mkdir build
     - cd build
+    - mkdir temp
+    - cd ../
+    - cd script
+    - cmd: "\"C:/Program Files/Git/usr/bin/bash.exe\" download_python_indexer.sh" 
+    - cd ../
+    - cd build
     - mkdir win64
     - cd win64
-    - cmake -G "Visual Studio 15 Win64" -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DQt5_DIR=C:/Qt/5.12.5/msvc2017_64/lib/cmake/Qt5 ../../
+    - cmake -G "Visual Studio 15 Win64" -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DQt5_DIR=C:/Qt/5.12.5/msvc2017_64/lib/cmake/Qt5 -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../../
     - cd ../../
 
-
 build_script:
     - cd build/win64
     - msbuild /p:configuration=Release /v:m ALL_BUILD.vcxproj
diff --git a/script/download_python_indexer.sh b/script/download_python_indexer.sh
index 52d38b3e..d583aa5b 100755
--- a/script/download_python_indexer.sh
+++ b/script/download_python_indexer.sh
@@ -10,6 +10,10 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
 	PLATFORM='linux'
 elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
 	PLATFORM='windows'
+elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
+	PLATFORM='windows'
+elif [ "$OSTYPE" == "msys" ]; then
+	PLATFORM='windows'
 fi
 
 PACKAGE_NAME="SourcetrailPythonIndexer_${SOURCETRAIL_PYTHON_INDEXER_VERSION}-${PLATFORM}"
@@ -24,30 +28,41 @@ SUCCESS="\033[32mSuccess:\033[00m"
 INFO="\033[33mInfo:\033[00m"
 
 if [ $PLATFORM == "windows" ]; then
-	ORIGINAL_PATH_TO_SCRIPT="${0}"
-	CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
-	ROOT_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
+	SCRIPT=`realpath $0`
+	if [ "$SCRIPT" == "" ]; then
+
+		ORIGINAL_PATH_TO_SCRIPT="${0}"
+		CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+		SCRIPT_DIR=${CLEANED_PATH_TO_SCRIPT%/*}
+	else
+		ORIGINAL_PATH_TO_SCRIPT=`dirname $SCRIPT`
+		SCRIPT_DIR="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+	fi
 else
-	ROOT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+	SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 fi
 
-ROOT_DIR=$ROOT_DIR/..
+echo "This script is running in: $SCRIPT_DIR"
+
 
 # Enter main directory
-cd $ROOT_DIR/
+cd $SCRIPT_DIR/
+cd ..
 
+BINARY_PATH="$TARGET_PATH/SourcetrailPythonIndexer"
+if [ $PLATFORM == "windows" ]; then
+	BINARY_PATH="${BINARY_PATH}.exe"
+fi
 
-if [ -e "$TARGET_PATH/SourcetrailPythonIndexer.exe" ]; then
-    echo "SourcetrailPythonIndexer already exists, checking version..."
-	
-	INSTALLED_VERSION="$($TARGET_PATH/SourcetrailPythonIndexer.exe --version)"
-	INSTALLED_VERSION="$(sed -e 's#.* \(\)#\1#' <<< $INSTALLED_VERSION)"
-	echo "SourcetrailPythonIndexer version is: $INSTALLED_VERSION"
-	
-	INSTALLED_VERSION="$(echo $INSTALLED_VERSION | tr . _)"
-	
-	if [ $INSTALLED_VERSION == $SOURCETRAIL_PYTHON_INDEXER_VERSION ]; then
-		echo "Nothing to update. Target version of SourcetrailPythonIndexer is already installed."
+if [ -e "${BINARY_PATH}" ]; then
+    echo -e $INFO "SourcetrailPythonIndexer already exists, checking version..."
+
+	INSTALLED_VERSION="$(${BINARY_PATH} --version)"
+	INSTALLED_VERSION=${INSTALLED_VERSION#* }
+	INSTALLED_VERSION="${INSTALLED_VERSION//./$'_'}"
+
+	if [ "$INSTALLED_VERSION" == "$SOURCETRAIL_PYTHON_INDEXER_VERSION" ]; then
+		echo -e $INFO "Nothing to update. Target version of SourcetrailPythonIndexer is already installed."
 		exit
 	fi
 fi