diff --git a/makerom/makerom.sln b/makerom/makerom.sln
index ff089e3..ab515c7 100644
--- a/makerom/makerom.sln
+++ b/makerom/makerom.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makerom", "makerom.vcxproj", "{21926330-F5A5-4643-AD32-D4F167CE226B}"
 EndProject
diff --git a/makerom/makerom.vcxproj b/makerom/makerom.vcxproj
index 896eb09..fa3547f 100644
--- a/makerom/makerom.vcxproj
+++ b/makerom/makerom.vcxproj
@@ -67,7 +67,7 @@
     <NMakeCleanCommandLine>make clean</NMakeCleanCommandLine>
     <NMakeReBuildCommandLine>make rebuild</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <IncludePath>C:\Program Files\mingw-w64\x86_64-4.9.2-win32-seh-rt_v4-rev2\mingw64\x86_64-w64-mingw32\include</IncludePath>
+    <IncludePath>C:\mingw\mingw64\x86_64-w64-mingw32\include</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <NMakeBuildCommandLine>make</NMakeBuildCommandLine>
diff --git a/makerom/user_settings.c b/makerom/user_settings.c
index 2d2753c..21a6eed 100644
--- a/makerom/user_settings.c
+++ b/makerom/user_settings.c
@@ -49,14 +49,12 @@ int ParseArgs(int argc, char *argv[], user_settings *set)
 
 	// Parsing Arguments
 	int set_result;
-	int i = 1;
-	while (i < argc) {
+	for (int i = 1; i < argc; i += set_result) {
 		set_result = SetArgument(argc, i, argv, set);
 		if (set_result < 1) {
 			fprintf(stderr, "[RESULT] Invalid arguments, see '%s -help'\n", argv[0]);
 			return set_result;
 		}
-		i += set_result;
 	}
 
 	// Checking arguments