diff --git a/MAGE/MAGE/src/core/version.hpp b/MAGE/MAGE/src/core/version.hpp
index 7ac6684ec..b0e9fb5eb 100644
--- a/MAGE/MAGE/src/core/version.hpp
+++ b/MAGE/MAGE/src/core/version.hpp
@@ -17,7 +17,7 @@
 // The version numbers (major/minor/patch) must be macros, allowing the use of 
 // these numbers in preprocessor directives (e.g. if).
 #define MAGE_VERSION_MAJOR 0
-#define MAGE_VERSION_MINOR 98
+#define MAGE_VERSION_MINOR 99
 #define MAGE_VERSION_PATCH 0
 
 #define MAGE_QUOTE(S) #S
diff --git a/MAGE/MAGE/src/ui/main_window.cpp b/MAGE/MAGE/src/ui/main_window.cpp
index 4e6677bfe..b34846c0c 100644
--- a/MAGE/MAGE/src/ui/main_window.cpp
+++ b/MAGE/MAGE/src/ui/main_window.cpp
@@ -64,15 +64,20 @@ namespace mage {
 			// Sent to the window with the keyboard focus when a nonsystem key 
 			// is released.
 
-			// Check whether the user wants to take a screenshot.
-			if (wParam == VK_SNAPSHOT) {
+			switch(wParam) {
+
+			case VK_SNAPSHOT: {
 				SwapChain::Get()->TakeScreenShot();
 			}
 
-			// Calls the default window procedure to provide default processing 
-			// for any window messages that an application does not process.
-			// This function ensures that every message is processed.
-			return DefWindowProc(hWnd, msg, wParam, lParam);
+			default: {
+				// Calls the default window procedure to provide default processing 
+				// for any window messages that an application does not process.
+				// This function ensures that every message is processed.
+				return DefWindowProc(hWnd, msg, wParam, lParam);
+			}
+
+			}
 		}
 
 		case WM_MENUCHAR: {
@@ -107,15 +112,20 @@ namespace mage {
 			// in this case, the WM_SYSKEYUP message is sent to the active 
 			// window.
 
-			// Check whether the user wants to take a screenshot.
-			if (wParam == VK_SNAPSHOT) {
+			switch (wParam) {
+
+			case VK_SNAPSHOT: {
 				SwapChain::Get()->TakeScreenShot();
 			}
 
-			// Calls the default window procedure to provide default processing 
-			// for any window messages that an application does not process.
-			// This function ensures that every message is processed.
-			return DefWindowProc(hWnd, msg, wParam, lParam);
+			default: {
+				// Calls the default window procedure to provide default processing 
+				// for any window messages that an application does not process.
+				// This function ensures that every message is processed.
+				return DefWindowProc(hWnd, msg, wParam, lParam);
+			}
+
+			}
 		}
 
 		case WM_SYSKEYDOWN: {
@@ -123,17 +133,21 @@ namespace mage {
 			// the F10 key (which activates the menu bar) or holds down the ALT 
 			// key and then presses another key.
 
-			// Check whether the user wants to switch between windowed and full 
-			// screen mode.
-			if (wParam == VK_RETURN) {
+			switch (wParam) {
+
+			case VK_RETURN: {
 				Engine::Get()->OnModeSwitch();
 				break;
 			}
 
-			// Calls the default window procedure to provide default processing 
-			// for any window messages that an application does not process.
-			// This function ensures that every message is processed.
-			return DefWindowProc(hWnd, msg, wParam, lParam);
+			default: {
+				// Calls the default window procedure to provide default processing 
+				// for any window messages that an application does not process.
+				// This function ensures that every message is processed.
+				return DefWindowProc(hWnd, msg, wParam, lParam);
+			}
+
+			}
 		}
 
 		default: {
diff --git a/MAGE/appveyor.yml b/MAGE/appveyor.yml
index d49b276a0..8c7033506 100644
--- a/MAGE/appveyor.yml
+++ b/MAGE/appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------#
 #      General Configuration      #
 #---------------------------------#
-version: 0.98.{build}
+version: 0.99.{build}
 
 branches:
   only: