diff --git a/Makefile b/Makefile
index 702e4b591840b8f2ca9a2a206129b368f7b3d5f3..c2cfe0a79ccdf819f02daa4638821abc4b9d4992 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,11 @@
 #     from doing messy things while making tarballs
 #   * make clean now removes .dSYM directories from MacOS compilation
 #   * make debug now builds EXECUTABLE_debug
+#       1. make clean
+#       2. make -rR
+#       3. make debug
+#     Will generate both an executable and executable_debug properly
+#   * Added -Wconversion to prevent conversion oversights
 # Version 4 - 2015-05-03, Marcus M. Darden (mmdarden@umich.edu)
 #   * Updated build rules for tests
 # Version 3.0.1 - 2015-01-22, Waleed Khan (wkhan@umich.edu)
@@ -82,7 +87,7 @@ PARTIAL_SUBMITFILE = partialsubmit.tar.gz
 FULL_SUBMITFILE = fullsubmit.tar.gz
 
 #Default Flags
-CXXFLAGS = -std=c++11 -Wall -Werror -Wextra -pedantic 
+CXXFLAGS = -std=c++11 -Wconversion -Wall -Werror -Wextra -pedantic 
 
 # make release - will compile "all" with $(CXXFLAGS) and the -O3 flag
 #				 also defines NDEBUG so that asserts will not check