diff --git a/README.md b/README.md
index 90d6150..8f89fd0 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ Compiler | Version
 -------- | -------
 gcc/g++  | 4.8+
 clang    | 3.3+
-MSVC++   | 2015+
 
 Other C++11 compliant compilers might work as well. OctaSTD does not utilize
 compiler specific extensions except certain builtin type traits - to implement
@@ -21,3 +20,8 @@ traits that are not normally possible to implement without compiler support.
 
 OctaSTD does not provide fallbacks for those traits. The compiler is expected
 to support these builtins. So far the 3 above-mentioned compilers support them.
+
+MSVC++ is currently unsupported. It is likely that it will never be supported,
+as it seems that MS will start supporting Clang in Visual Studio; however,
+if that does not happen and the MS C++ compiler gains the required features,
+support will be added.
\ No newline at end of file
diff --git a/octa/atomic.h b/octa/atomic.h
index e51d41e..3705799 100644
--- a/octa/atomic.h
+++ b/octa/atomic.h
@@ -76,6 +76,8 @@ namespace octa {
 
 #ifdef _MSC_VER
 
+/* MSVC support is disabled for now */
+#if 0
 #define ATOMIC_BOOL_LOCK_FREE 2
 #define ATOMIC_CHAR_LOCK_FREE 2
 #define ATOMIC_CHAR16_T_LOCK_FREE 2
@@ -448,6 +450,9 @@ namespace octa {
     }
 
 #undef __OCTA_MSVC_ATOMIC_FETCH_OP
+#else
+#error No MSVC support right now!
+#endif
 
 #else