diff --git a/.travis.yml b/.travis.yml
index 9c8717aa..ead6f2da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,5 +128,6 @@ deploy:
   file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz
   skip_cleanup: true
   on:
-    branch: master
+    tags: true
+    all_branches: true
     condition: ${ENABLE_COVERAGE} = false
diff --git a/appveyor.yml b/appveyor.yml
index fed23628..700a5110 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,30 +3,48 @@ os:
 
 platform:
   - x86
-#  - x64
+  - x64
 
 environment:
-  FFMPEG_VERSION: 2.4.5
-  DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5
-  AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install
+  global:
+    DEPENDENCY_NAME: ffmpeg
+    DEPENDENCY_VERSION: 2.4.5
+    DEPENDENCY_INSTALL_PATH: C:\ProgramData\install-dependency
+    AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install-avtranscoder
 
-matrix:
-  fast_finish: true
+  matrix:
+    - fast_finish: true
 
 init:
   - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %platform%
 
-before_build:
+install:
+  # Install build dependencies
   - choco install -y swig
   - tools/appveyor/win.install.deps.bat
 
-build_script:
-  - tools/appveyor/build.bat
+  # Get the correct python version
+  - ps: if($env:platform -eq 'x86') {
+          $env:PYTHON = "C:\Python27";
+        }
+        else {
+          $env:PYTHON = "C:\Python27-x64";
+        }
+  # Prepend newly installed Python to the PATH of this build
+  - cmd: set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+  - cmd: echo %PATH%
+  # Check that we have the expected version and architecture for Python
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  # Upgrade to the latest version of pip to avoid it displaying warnings about it being out of date.
+  - pip install --disable-pip-version-check --user --upgrade pip
 
-before_test:
-  - set PATH=C:\Python27\scripts;%PATH%
+  # Install tests dependencies
   - pip install nose
 
+build_script:
+  - tools/appveyor/build.bat
+
 test_script:
   - cd ..
   - tools/appveyor/python.nosetests.bat
@@ -36,23 +54,17 @@ on_failure:
   - type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log"
 
 on_success:
-  - 7z a ffmpeg.zip %DEPENDENCY_INSTALL_PATH%
-  - 7z a avtranscoder.zip %AVTRANSCODER_INSTALL_PATH%
+  - 7z a avtranscoder-win%PLATFORM%-%DEPENDENCY_NAME%-%DEPENDENCY_VERSION%.zip %DEPENDENCY_INSTALL_PATH% %AVTRANSCODER_INSTALL_PATH%
 
 artifacts:
-  - path: ffmpeg.zip
-    name: ffmpeg
-    type: zip
-
-  - path: avtranscoder.zip
+  - path: avtranscoder-win%PLATFORM%-%DEPENDENCY_NAME%-%DEPENDENCY_VERSION%.zip
     name: avtranscoder
     type: zip
 
 deploy:
   - provider: GitHub
-    artifact: ffmpeg,avtranscoder
+    artifact: avtranscoder
     auth_token:
     secure: sApasbQe2i7Uu+XNhlkXg+F6zI0VNHUjhq5QfK6/+NSs4lX/9BwhkLvibQc6bmMv
     on:
-      branch: master
       appveyor_repo_tag: true
diff --git a/tools/appveyor/build.bat b/tools/appveyor/build.bat
index e71e0850..d3393bc4 100755
--- a/tools/appveyor/build.bat
+++ b/tools/appveyor/build.bat
@@ -4,7 +4,7 @@ MKDIR build
 cd build
 
 :: Configure
-call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%%AVTRANSCODER_INSTALL_PATH%% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
+call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%AVTRANSCODER_INSTALL_PATH% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
 
 :: Build & Install
 call nmake /F Makefile
diff --git a/tools/appveyor/win.install.deps.bat b/tools/appveyor/win.install.deps.bat
index 7f399154..6c37998f 100755
--- a/tools/appveyor/win.install.deps.bat
+++ b/tools/appveyor/win.install.deps.bat
@@ -4,14 +4,14 @@ if %platform% == x86 set PLATFORM_VERSION=32
 if %platform% == X64 set PLATFORM_VERSION=64
 
 :: Installing ffmpeg dev (include + apps)
-curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev.7z
-7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev.7z
+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z
+7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z
 
 :: Installing ffmpeg shared (libs)
-curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared.7z
-7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared.7z
+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z
+7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z
 
-move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev
-move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev C:\ProgramData\ffmpeg-%FFMPEG_VERSION%
+move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev
+move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev %DEPENDENCY_INSTALL_PATH%
 
 @echo off