--- C:/Users/Hajo/Downloads/MediaPortal-1-master/MediaPortal-1-master/Common-MP-TVE3/OsInfo/OSInfooriginal.cs	Wed Oct 01 00:19:04 2014
+++ C:/Users/Hajo/Downloads/MediaPortal-1-master/MediaPortal-1-master/Common-MP-TVE3/OsInfo/OSInfo.cs	Thu Oct 02 09:05:43 2014
@@ -205,6 +205,10 @@
       ///</summary>
       Windows81,
       ///<summary>
+      /// Windows 10
+      ///</summary>
+      Windows10,
+      ///<summary>
       /// Windows 2003 Server
       ///</summary>
       Windows2003,
@@ -223,7 +227,11 @@
       ///<summary>
       /// Windows 2012 Server
       ///</summary>
-      Windows2012
+      Windows2012,
+      ///<summary>
+      /// Windows X Server
+      ///</summary>
+      WindowsX
     }
 
     /// <summary>
@@ -520,6 +528,9 @@
                     case 3:
                       osName = OSProductType == NT_WORKSTATION ? "Windows 81" : "Windows 2012";
                       break;
+                    case 4:
+                      osName = OSProductType == NT_WORKSTATION ? "Windows 10" : "Windows X";
+                      break;
                   }
                   break;
                 }
@@ -560,6 +571,8 @@
           return OSProductType == NT_WORKSTATION ? OSList.Windows8 : OSList.Windows2012;
         case 63:
           return OSProductType == NT_WORKSTATION ? OSList.Windows81 : OSList.Windows2012;
+        case 64:
+          return OSProductType == NT_WORKSTATION ? OSList.Windows10 : OSList.WindowsX;
       }
       return OSList.Windows2000andPrevious;
     }
@@ -608,6 +621,10 @@
       { // Windows 8.1 RTM
         return OsSupport.FullySupported;
       }
+      if (VerifyDesktopOSMinRequirement(6, 4, 9841, NT_WORKSTATION, 0))
+      { // Windows 10 Technical Preview
+        return OsSupport.FullySupported;
+      }
       if (IsServer())
       { // any server OS
         return OsSupport.NotSupported;
@@ -674,6 +691,16 @@
     public static bool Win81OrLater()
     {
       return VerifyVersionGreaterEqual(6, 3);
+    }
+    
+        /// <summary>
+    /// Return if running on Windows8.1 or later
+    /// </summary>
+    /// <returns>true means Windows8.1 or later</returns>
+    /// <returns>false means Win8 or previous</returns>
+    public static bool Win10OrLater()
+    {
+      return VerifyVersionGreaterEqual(6, 4);
     }
 
     /// <summary>