diff --git a/numpy-atlas.dll b/numpy-atlas.dll
new file mode 100644
index 00000000..6a18bc36
Binary files /dev/null and b/numpy-atlas.dll differ
diff --git a/pyscenedetect.pyproj b/pyscenedetect.pyproj
new file mode 100644
index 00000000..c1aa0f09
--- /dev/null
+++ b/pyscenedetect.pyproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{d311cf12-a8b3-4b58-976c-03ec261c8466}</ProjectGuid>
+    <ProjectHome />
+    <StartupFile>scenedetect.py</StartupFile>
+    <SearchPath />
+    <WorkingDirectory>.</WorkingDirectory>
+    <OutputPath>.</OutputPath>
+    <ProjectTypeGuids>{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
+    <LaunchProvider>Standard Python launcher</LaunchProvider>
+    <InterpreterId />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
+  <PropertyGroup>
+    <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="scenedetect.py" />
+    <Compile Include="scenedetect\cli.py" />
+    <Compile Include="scenedetect\detectors.py" />
+    <Compile Include="scenedetect\manager.py" />
+    <Compile Include="scenedetect\platform.py" />
+    <Compile Include="scenedetect\timecodes.py" />
+    <Compile Include="scenedetect\__init__.py" />
+    <Compile Include="scenedetect\__main__.py" />
+    <Compile Include="setup.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="docs\img\params.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="docs\" />
+    <Folder Include="docs\img" />
+    <Folder Include="scenedetect" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
+</Project>
\ No newline at end of file
diff --git a/scenedetect/__init__.py b/scenedetect/__init__.py
index ef888dfb..0b8e6e2e 100644
--- a/scenedetect/__init__.py
+++ b/scenedetect/__init__.py
@@ -360,8 +360,13 @@ def split_input_video(input_path, output_path, timecode_list_str):
     print('[PySceneDetect] Splitting video into clips...')
     ret_val = None
     try:
+        mkvmerge_path = 'mkvmerge'
+        windows_mkvmerge_path = r"C:\Program Files\MKVToolNix\mkvmerge.exe"
+        if 'win32' in sys.platform and os.path.exists(windows_mkvmerge_path):
+            mkvmerge_path = windows_mkvmerge_path
+        
         ret_val = subprocess.call(
-            ['mkvmerge',
+            [mkvmerge_path,
              '-o', output_path,
              '--split', 'timecodes:%s' % timecode_list_str,
              input_path])
diff --git a/setup.py b/setup.py
index 01143375..b484c86a 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 import sys
 
 from setuptools import setup
-
+import py2exe
 
 if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3):
     print('PySceneDetect requires at least Python 2.6 or 3.3 to run.')
@@ -61,5 +61,14 @@ def get_requires():
         'Topic :: Multimedia :: Video :: Conversion',
         'Topic :: Multimedia :: Video :: Non-Linear Editor',
         'Topic :: Utilities'
-    ]
+    ],
+    options = {
+        'py2exe' : {
+            'compressed': True,
+            'bundle_files': 1,
+            'dist_dir': 'dist',
+            "dll_excludes": ['api-ms-win-mm-time-l1-1-0.dll', 'api-ms-win-core-registry-l2-2-0.dll', 'api-ms-win-core-privateprofile-l1-1-1.dll', 'api-ms-win-core-stringansi-l1-1-0.dll', 'api-ms-win-core-heap-obsolete-l1-1-0.dll', 'api-ms-win-core-largeinteger-l1-1-0.dll', 'api-ms-win-core-libraryloader-l1-2-2.dll', 'api-ms-win-core-string-obsolete-l1-1-0.dll', "MSVCP90.dll","libzmq.pyd","geos_c.dll","api-ms-win-core-string-l1-1-0.dll","api-ms-win-core-registry-l1-1-0.dll","api-ms-win-core-errorhandling-l1-1-1.dll","api-ms-win-core-string-l2-1-0.dll","api-ms-win-core-profile-l1-1-0.dll","api-ms-win*.dll","api-ms-win-core-processthreads-l1-1-2.dll","api-ms-win-core-libraryloader-l1-2-1.dll","api-ms-win-core-file-l1-2-1.dll","api-ms-win-security-base-l1-2-0.dll","api-ms-win-eventing-provider-l1-1-0.dll","api-ms-win-core-heap-l2-1-0.dll","api-ms-win-core-libraryloader-l1-2-0.dll","api-ms-win-core-localization-l1-2-1.dll","api-ms-win-core-sysinfo-l1-2-1.dll","api-ms-win-core-synch-l1-2-0.dll","api-ms-win-core-heap-l1-2-0.dll","api-ms-win-core-handle-l1-1-0.dll","api-ms-win-core-io-l1-1-1.dll","api-ms-win-core-com-l1-1-1.dll","api-ms-win-core-memory-l1-1-2.dll","api-ms-win-core-version-l1-1-1.dll","api-ms-win-core-version-l1-1-0.dll"]
+        }
+    },
+    console=['scenedetect.py']
 )