diff --git a/.gitmodules b/.gitmodules
index b5fc9e68..4f334b31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "mcpelauncher-server"]
 	path = mcpelauncher-server
 	url = ../mcpelauncher-server.git
+[submodule "arg-parser"]
+	path = arg-parser
+	url = ../arg-parser.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce8bf422..2977b481 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ else()
     set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
 endif(APPLE)
 
-
 include(ext/json.cmake)
 include(ext/glfw.cmake)
 
@@ -19,6 +18,7 @@ add_subdirectory(logger)
 add_subdirectory(base64)
 add_subdirectory(file-util)
 add_subdirectory(properties-parser)
+add_subdirectory(arg-parser)
 
 add_subdirectory(simple-ipc)
 add_subdirectory(daemon-utils/client)
diff --git a/arg-parser b/arg-parser
new file mode 160000
index 00000000..96c5e241
--- /dev/null
+++ b/arg-parser
@@ -0,0 +1 @@
+Subproject commit 96c5e2412fed0e8968aed77f630daae521f613ce
diff --git a/mcpelauncher-client b/mcpelauncher-client
index 78f79b12..9425192b 160000
--- a/mcpelauncher-client
+++ b/mcpelauncher-client
@@ -1 +1 @@
-Subproject commit 78f79b12dfb288448a9128b5c31f7d65d667fe77
+Subproject commit 9425192b607fe06ad1a4d604523d2c2db3ebb56d
diff --git a/mcpelauncher-common b/mcpelauncher-common
index 7fb2bf08..367f16ea 160000
--- a/mcpelauncher-common
+++ b/mcpelauncher-common
@@ -1 +1 @@
-Subproject commit 7fb2bf08338486991ec8770fe9cc0aa43030e196
+Subproject commit 367f16eab96f0e19966b2a9e874ce4d6e564f3ee
diff --git a/mcpelauncher-core b/mcpelauncher-core
index 34ed6a50..14c3dc33 160000
--- a/mcpelauncher-core
+++ b/mcpelauncher-core
@@ -1 +1 @@
-Subproject commit 34ed6a501a8c7403bf32ecefaf09203dea798c80
+Subproject commit 14c3dc3301bd182d8fa5a488eac360b6c189e230