diff --git a/.gitmodules b/.gitmodules
index cc65cad..c019d90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vendor/raylib-cpp"]
 	path = vendor/raylib-cpp
 	url = https://github.com/robloach/raylib-cpp
+[submodule "vendor/raylib"]
+	path = vendor/raylib
+	url = https://github.com/raysan5/raylib
diff --git a/Makefile b/Makefile
index bd0d848..7228402 100644
--- a/Makefile
+++ b/Makefile
@@ -71,15 +71,15 @@ submodules:
 # Copy the relevant header files into includes
 include: submodules
 	$(MKDIR) $(call platformpth, ./include)
-	$(call COPY,vendor/raylib-cpp/vendor/raylib/src,./include,raylib.h)
-	$(call COPY,vendor/raylib-cpp/vendor/raylib/src,./include,raymath.h)
+	$(call COPY,vendor/raylib/src,./include,raylib.h)
+	$(call COPY,vendor/raylib/src,./include,raymath.h)
 	$(call COPY,vendor/raylib-cpp/include,./include,*.hpp)
 
 # Build the raylib static library file and copy it into lib
 lib: submodules
-	cd vendor/raylib-cpp/vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP
+	cd vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP
 	$(MKDIR) $(call platformpth, lib/$(platform))
-	$(call COPY,vendor/raylib-cpp/vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a)
+	$(call COPY,vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a)
 
 # Link the program and create the executable
 $(target): $(objects)
diff --git a/README.md b/README.md
index 60245cc..ee52d66 100644
--- a/README.md
+++ b/README.md
@@ -138,6 +138,7 @@ It's pretty simple actually:
 - [mTvare6](https://github.com/mTvare6) mTvare6 - contributor
 - [rafaeldelboni](https://github.com/rafaeldelboni) Rafael Delboni - contributor
 - [jason-cannon](https://github.com/jason-cannon) Jason Cannon - contributor
+- [return215](https://github.com/return215) Muhammad Hidayat - contributor
 
 ## Licence
 
diff --git a/vendor/raylib b/vendor/raylib
new file mode 160000
index 0000000..0851960
--- /dev/null
+++ b/vendor/raylib
@@ -0,0 +1 @@
+Subproject commit 0851960397f02a477d80eda2239f90fae14dec64
diff --git a/vendor/raylib-cpp b/vendor/raylib-cpp
index 6aa148c..a8f803e 160000
--- a/vendor/raylib-cpp
+++ b/vendor/raylib-cpp
@@ -1 +1 @@
-Subproject commit 6aa148cbb8a46c30ed2e49c87cfd06ff255ae016
+Subproject commit a8f803edae6db67dafa1f84c1099f1bbc74925ef