diff --git a/.gitmodules b/.gitmodules
index 2ad85bd..b43976d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "thirdparty/JM"]
 	path = thirdparty/JM
 	url = https://github.com/slavanap/JM.git
+[submodule "Sub3D"]
+	path = Sub3D
+	url = p:/sub3d
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fce5b54..87a6620 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,17 +15,17 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 add_definitions(-D _UNICODE)
 
+add_subdirectory(thirdparty)
+
 add_subdirectory(CoreAVCWrapper)
 add_subdirectory(FilmTester)
 add_subdirectory(AvsTools)
 add_subdirectory(LoadHelper)
-
-add_subdirectory(thirdparty/BaseClasses)
 add_subdirectory(ssifSource)
 
-add_subdirectory(thirdparty/lua)
-add_subdirectory(thirdparty/tinyxml2)
-add_subdirectory(Sub3D)
+if (EXISTS "${PROJECT_SOURCE_DIR}/Sub3D/CMakeLists.txt")
+	add_subdirectory(Sub3D)
+endif()
 
 set(CPACK_GENERATOR NSIS)
 set(CPACK_PACKAGE_NAME "ssifSource")
diff --git a/Sub3D b/Sub3D
new file mode 160000
index 0000000..fbcd6c7
--- /dev/null
+++ b/Sub3D
@@ -0,0 +1 @@
+Subproject commit fbcd6c75a815769429c83fcb71d208cfeaeeedde
diff --git a/ssifSource/dllmain.cpp b/ssifSource/dllmain.cpp
index 68e17b4..c588373 100644
--- a/ssifSource/dllmain.cpp
+++ b/ssifSource/dllmain.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include <Filter.Pipe.hpp>
 #include <Tools.WinApi.hpp>
+#include <Filter.CropDetect.hpp>
 
 #include "Filter.mplsSource.hpp"
 #include "Filter.mplsSource2.hpp"
@@ -30,6 +31,7 @@ const char* WINAPI AvisynthPluginInit2(IScriptEnvironment* env) {
 	env->AddFunction("PipeReaderForHandle", Filter::Pipe::PipeReader::CreateForHandleParams, Filter::Pipe::PipeReader::CreateForHandle, nullptr);
 	env->AddFunction("PipeWriter", Filter::Pipe::PipeWriter::CreateParams, Filter::Pipe::PipeWriter::Create, nullptr);
 	env->AddFunction("PipeWriterForHandle", Filter::Pipe::PipeWriter::CreateForHandleParams, Filter::Pipe::PipeWriter::CreateForHandle, nullptr);
+	env->AddFunction("CropDetect", Filter::CropDetect::CreateParams, Filter::CropDetect::Create, nullptr);
 	env->AddFunction("ssifSource", Filter::ssifSource::CreateParams, Filter::ssifSource::Create, nullptr);
 	env->AddFunction("mplsSource", Filter::mplsSource::CreateParams, Filter::mplsSource::Create, nullptr);
 	env->AddFunction("mplsSource2", Filter::mplsSource2::CreateParams, Filter::mplsSource2::Create, nullptr);
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
new file mode 100644
index 0000000..2aaa599
--- /dev/null
+++ b/thirdparty/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory(BaseClasses)
+set(BASECLASSES_INCLUDE_DIR ${BASECLASSES_INCLUDE_DIR} PARENT_SCOPE)
+
+add_subdirectory(tinyxml2)
+
+project(Lua)
+file(GLOB SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Lua/src/*.c Lua/src/*.h)
+list(REMOVE_ITEM SOURCES Lua/src/luac.c)
+add_library(${PROJECT_NAME} ${SOURCES})
+set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Third Party")
diff --git a/thirdparty/JM b/thirdparty/JM
index abe4140..415998b 160000
--- a/thirdparty/JM
+++ b/thirdparty/JM
@@ -1 +1 @@
-Subproject commit abe4140168f8b00dd54f4c82fdcaa58e673d9bc3
+Subproject commit 415998bcabd259e9dbc5cc758d1e6982578ed1ce