diff --git a/HISTORY b/HISTORY
index 04665dd..8dccc60 100755
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,7 @@
+Jun. 10 2017
+Fixed a processing bug with the ELSE statement, thanks to yukini3 for pointing it out
+Avoided warnings with some compilers
+
 Jun. 7 2017
 Added an mb_get_routine_type function
 Renamed mb_close_forked to mb_join
diff --git a/core/my_basic.c b/core/my_basic.c
index e62609e..7baa70e 100755
--- a/core/my_basic.c
+++ b/core/my_basic.c
@@ -8223,6 +8223,8 @@ static void _init_routine(mb_interpreter_t* s, _routine_t* routine, char* n, mb_
 	case MB_RT_NATIVE:
 		routine->func.native.entry = f;
 
+		break;
+	default: /* Do nothing */
 		break;
 	}
 
@@ -8423,6 +8425,8 @@ static void _destroy_routine(mb_interpreter_t* s, _routine_t* r) {
 			break;
 		case MB_RT_NATIVE: /* Do nothing */
 			break;
+		default: /* Do nothing */
+			break;
 		}
 	}
 	safe_free(r);
@@ -14815,7 +14819,7 @@ _elseif:
 
 				break;
 			}
-			if(multi_line && ast && _IS_FUNC(ast->data, _core_elseif))
+			if(multi_line && ast && (_IS_FUNC(ast->data, _core_else) || _IS_FUNC(ast->data, _core_elseif)))
 				break;
 			result = _execute_statement(s, &ast, true);
 			if(result != MB_FUNC_OK)
diff --git a/my_basic.vcproj b/my_basic.vcproj
index e4f34a4..698d3dd 100755
--- a/my_basic.vcproj
+++ b/my_basic.vcproj
@@ -18,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="debug|Win32"
-			OutputDirectory="output"
+			OutputDirectory="output/debug"
 			IntermediateDirectory="temp/debug"
 			ConfigurationType="1"
 			CharacterSet="1"
@@ -63,10 +63,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
+				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
diff --git a/output/my_basic.exe b/output/my_basic.exe
index d261c92..eae6d5b 100755
Binary files a/output/my_basic.exe and b/output/my_basic.exe differ
diff --git a/output/my_basic_mac b/output/my_basic_mac
index 63fea0b..819dfd8 100755
Binary files a/output/my_basic_mac and b/output/my_basic_mac differ