diff --git a/LICENSE b/LICENSE
index d7f105139782ab695d86613e343916f7372f4ac0..6ac895e81f7a34bde9e2eda971e98a449f42a33d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-GNU GENERAL PUBLIC LICENSE
+GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
diff --git a/README.md b/README.md
index caab52e70174cadee7b2871d989709f56b4567dc..bca9cda4976a9dec4d0d30a1420fe7ef92e422f3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,71 @@
-AntiChinaCerts
+AntiChinaCerts
 ==============
-
 Anti China Certifications.
+
+### 版本
+Last updated on **2014-09-07**
+
+### 使用方法
+* Base 版本**以管理员身份运行** AntiChinaCerts(Base).bat
+* Extended 版本**以管理员身份运行** AntiChinaCerts(Extended).bat
+
+### 说明
+* Extended 版本为 Base 版本扩展，添加另外几个CA根证书
+* 使用前可使用 Microsoft_Fixit_20135.diagcab(Win7以及之后) 或者 Microsoft_Fixit_51014.msi(Vista以及之前) 重置证书列表，不过大多数情况下并不需要
+* 使用前 **强烈建议以管理员身份运行自带的RootSUPD** 更新系统的证书列表
+
+### 注意
+* **将CA根证书直接删掉是没有任何作用的，下次访问使用该证书的网站时系统又会重新自动联网添加回去！**
+* 本工具作用是先将列表中的CA根证书删掉，然后再将这些证书添加到CRL证书吊销列表中，这样证书才会被彻底禁用
+* **因为每个用户使用的证书列表都是独立的，所以需要所有用户都运行一次才能彻底禁用这些证书！**
+* 运行时如果遇到 Error: Can not find a certificate matching the hash value 不需要在意，只要后面 CertMgr Succeeded 运行成功就行，如果提示错误请检查是否是以管理员权限运行
+
+### 涉及的CA根证书
+* Base 版本
+    * CNNIC ROOT
+        * SHA-1 指纹 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F
+        * 所属机构为 [China Internet Network Information Center/CNNIC/中国互联网络信息中心](http://www.cnnic.net.cn)
+        * [测试网址](https://www.cnnic.net.cn)
+    * China Internet Network Information Center EV Certificates Root
+        * SHA-1 指纹 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E
+        * 所属机构为 [China Internet Network Information Center/CNNIC/中国互联网络信息中心](http://www.cnnic.net.cn)
+        * [测试网址](https://evdemo.cnnic.cn)
+* Extended 版本
+    * ROOTCA
+        * SHA-1 指纹 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E
+        * 所属机构为 [Office of the State Commercial Cryptography Administration/OSCCA/国家商用密码管理办公室](http://www.oscca.gov.cn)
+        * 测试：打开 Certs 目录中 CFCA_CS_SM2_OCA11 证书，该证书由 ROOTCA 交叉签署认证
+    * CFCA GT CA
+        * SHA-1 指纹 EABDA240440ABBD694930A01D09764C6C2D77966
+        * 所属机构为 [China Financial Certification Authority/CFCA/中国金融认证中心](http://www.cfca.com.cn)
+        * [测试网址](https://cstest.cfca.com.cn)
+    * CFCA EV ROOT
+        * SHA-1 指纹 E2B8294B5584AB6B58C290466CAC3FB8398F8483
+        * 所属机构为 [China Financial Certification Authority/CFCA/中国金融认证中心](http://www.cfca.com.cn)
+        * [测试网址](https://cs.cfca.com.cn)
+    * UCA Global Root
+        * SHA-1 指纹 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF
+        * 所属机构为 [Shanghai Electronic Certificate Authority Center/SHECA/上海市数字证书认证中心](http://www.sheca.com)
+        * [测试网址](https://cs.cfca.com.cn)
+    * UCA Root
+        * SHA-1 指纹 8250BED5A214433A66377CBC10EF83F669DA3A67
+        * 所属机构为 [Shanghai Electronic Certificate Authority Center/SHECA/上海市数字证书认证中心](http://www.sheca.com)
+    * UCA EV Root
+        * SHA-1 指纹 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E
+        * 所属机构为 [Shanghai Electronic Certificate Authority Center/SHECA/上海市数字证书认证中心](http://www.sheca.com)
+* 观察中的CA根证书（**这些证书没有被工具禁用**）
+    * SRCA
+        * 本证书由其自行颁发，没有经过任何符合国际标准的国际事务所进行审计
+        * 所属机构为 [Sinorail Certification Authority/SRCA/中铁数字证书认证中心](http://www.12306.cn)
+        * [测试网址](https://kyfw.12306.cn)
+    * Certification Authority of WoSign
+        * 没有安装最新CA根证书列表时则由 StartCom Certification Authority 交叉签署认证
+        * 所属机构为 [沃通CA](http://www.wosign.com)
+        * [测试网址](https://www.wosign.com)
+    * CA 沃通根证书
+        * SHA-1 指纹 ?1632478D89F9213A92008563F5A4A7D312408AD6
+        * 所属机构为 [沃通CA](http://www.wosign.com)
+    * Class 1 Primary CA/WoSign 1999
+        * 沃通CA收购美国 WoSign 的旧证书，于1999年发布
+        * SHA-1 指纹 ?1632478D89F9213A92008563F5A4A7D312408AD6
+        * 所属机构为 [沃通CA](http://www.wosign.com)
diff --git a/Windows/System/AntiChinaCerts(Base).bat b/Windows/System/AntiChinaCerts(Base).bat
new file mode 100644
index 0000000000000000000000000000000000000000..473a11d2fe8ddeabbd3e33deeba1a852ffb3d2e9
--- /dev/null
+++ b/Windows/System/AntiChinaCerts(Base).bat
@@ -0,0 +1,34 @@
+:: AntiChinaCerts Base batch
+:: Anti China Certifications.
+:: 
+:: Author: Chengr28
+:: 
+
+@echo off
+
+:: Permission check
+if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (set SystemPath = %SystemRoot%\SysWOW64) else (set SystemPath = %SystemRoot%\system32)
+rd "%SystemPath%\test_permissions" > nul 2 > nul
+md "%SystemPath%\test_permissions" 2 > nul || (echo Require Administrator Permission. && pause > nul && Exit)
+rd "%SystemPath%\test_permissions" > nul 2 > nul
+cls
+
+:: Delete certifications(Base)
+cd /d %~dp0/Certs
+::  CNNIC ROOT
+certmgr /del /c /sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F /s Root
+::  China Internet Network Information Center EV Certificates Root
+certmgr /del /c /sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E /s Root
+
+@echo.
+
+:: Add certifications to CRL.
+::  Base
+certmgr /add /c CNNIC_ROOT.cer /s Disallowed
+certmgr /add /c China_Internet_Network_Information_Center_EV_Certificates_Root.cer /s Disallowed
+
+:: Print to screen.
+@echo.
+@echo Done. Please confirm the messages on screen.
+@echo.
+@pause
diff --git a/Windows/System/AntiChinaCerts(Extended).bat b/Windows/System/AntiChinaCerts(Extended).bat
new file mode 100644
index 0000000000000000000000000000000000000000..88ebc88e30ed8470050a522108a64195c70c59db
--- /dev/null
+++ b/Windows/System/AntiChinaCerts(Extended).bat
@@ -0,0 +1,54 @@
+:: AntiChinaCerts Extended batch
+:: Anti China Certifications.
+:: 
+:: Author: Chengr28
+:: 
+
+@echo off
+
+:: Permission check
+if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (set SystemPath = %SystemRoot%\SysWOW64) else (set SystemPath = %SystemRoot%\system32)
+rd "%SystemPath%\test_permissions" > nul 2 > nul
+md "%SystemPath%\test_permissions" 2 > nul || (echo Require Administrator Permission. && pause > nul && Exit)
+rd "%SystemPath%\test_permissions" > nul 2 > nul
+cls
+
+:: Delete certifications(Base)
+cd /d %~dp0/Certs
+::  CNNIC ROOT
+certmgr /del /c /sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F /s Root
+::  China Internet Network Information Center EV Certificates Root
+certmgr /del /c /sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E /s Root
+:: Delete certs(Extended)
+::  ROOTCA
+certmgr /del /c /sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB /s Root
+::  CFCA GT CA
+certmgr /del /c /sha1 EABDA240440ABBD694930A01D09764C6C2D77966 /s Root
+::  CFCA EV ROOT
+certmgr /del /c /sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 /s Root
+::  UCA Global Root
+certmgr /del /c /sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF /s Root
+::  UCA Root
+certmgr /del /c /sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 /s Root
+::  UCA EV Root
+certmgr /del /c /sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E /s Root
+
+@echo.
+
+:: Add certifications to CRL.
+::  Base
+certmgr /add /c CNNIC_ROOT.cer /s Disallowed
+certmgr /add /c China_Internet_Network_Information_Center_EV_Certificates_Root.cer /s Disallowed
+::  Extended
+certmgr /add /c ROOTCA.cer /s Disallowed
+certmgr /add /c CFCA_GT_CA.cer /s Disallowed
+certmgr /add /c CFCA_EV_ROOT.cer /s Disallowed
+certmgr /add /c UCA_Global_Root.cer /s Disallowed
+certmgr /add /c UCA_Root.cer /s Disallowed
+certmgr /add /c UCA_EV_Root.cer /s Disallowed
+
+:: Print to screen.
+@echo.
+@echo Done. Please confirm the messages on screen.
+@echo.
+@pause
diff --git "a/Windows/System/Certs/CA_\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.cer" "b/Windows/System/Certs/CA_\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.cer"
new file mode 100644
index 0000000000000000000000000000000000000000..12bf89ad86f8afc2bbcda79d3938e2a0379ad1c1
Binary files /dev/null and "b/Windows/System/Certs/CA_\346\262\203\351\200\232\346\240\271\350\257\201\344\271\246.cer" differ
diff --git a/Windows/System/Certs/CFCA_CS_SM2_OCA11.cer b/Windows/System/Certs/CFCA_CS_SM2_OCA11.cer
new file mode 100644
index 0000000000000000000000000000000000000000..746a69e908b6bd5c14929d1d7fcc90d9925e3b79
Binary files /dev/null and b/Windows/System/Certs/CFCA_CS_SM2_OCA11.cer differ
diff --git a/Windows/System/Certs/CFCA_EV_ROOT.cer b/Windows/System/Certs/CFCA_EV_ROOT.cer
new file mode 100644
index 0000000000000000000000000000000000000000..cbccb435dde7829075f291c4f29f36df4fa5fc84
Binary files /dev/null and b/Windows/System/Certs/CFCA_EV_ROOT.cer differ
diff --git a/Windows/System/Certs/CFCA_GT_CA.cer b/Windows/System/Certs/CFCA_GT_CA.cer
new file mode 100644
index 0000000000000000000000000000000000000000..a0b5fb4c85168085245b367072952f4c2ea3cd4f
Binary files /dev/null and b/Windows/System/Certs/CFCA_GT_CA.cer differ
diff --git a/Windows/System/Certs/CNNIC_ROOT.cer b/Windows/System/Certs/CNNIC_ROOT.cer
new file mode 100644
index 0000000000000000000000000000000000000000..c81744b5f5e32430b12b080b4fe2bdc04263195e
--- /dev/null
+++ b/Windows/System/Certs/CNNIC_ROOT.cer
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
diff --git a/Windows/System/Certs/CertMgr.exe b/Windows/System/Certs/CertMgr.exe
new file mode 100644
index 0000000000000000000000000000000000000000..911654e3c151ec341b4a2fed5959a3570109a1dc
Binary files /dev/null and b/Windows/System/Certs/CertMgr.exe differ
diff --git a/Windows/System/Certs/Certification_Authority_Of_WoSign.crt b/Windows/System/Certs/Certification_Authority_Of_WoSign.crt
new file mode 100644
index 0000000000000000000000000000000000000000..e3abaaa758ccdebac27a00285acbd4ca5ec08bf2
--- /dev/null
+++ b/Windows/System/Certs/Certification_Authority_Of_WoSign.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBV
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNV
+BAMTIUNlcnRpZmljYXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgw
+MTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFX
+b1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvcqN
+rLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1U
+fcIiePyOCbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcScc
+f+Hb0v1naMQFXQoOXXDX2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2
+ZjC1vt7tj/id07sBMOby8w7gLJKA84X5KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4M
+x1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR+ScPewavVIMYe+HdVHpR
+aG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ezEC8wQjch
+zDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDar
+uHqklWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221K
+mYo0SLwX3OSACCK28jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvA
+Sh0JWzko/amrzgD5LkhLJuYwTKVYyrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWv
+HYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0CAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R8bNLtwYgFP6H
+EtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJ
+MuYhOZO9sxXqT2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2e
+JXLOC62qx1ViC777Y7NhRCOjy+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VN
+g64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC2nz4SNAzqfkHx5Xh9T71XXG68pWp
+dIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes5cVAWubXbHssw1ab
+R80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/EaEQ
+PkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGce
+xGATVdVhmVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+
+J7x6v+Db9NpSvd4MVHAxkUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMl
+OtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGikpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWT
+ee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
diff --git a/Windows/System/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.cer b/Windows/System/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.cer
new file mode 100644
index 0000000000000000000000000000000000000000..217d433ae4403eb8c0cc6f02b2759f25eaeedcc0
Binary files /dev/null and b/Windows/System/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.cer differ
diff --git a/Windows/System/Certs/Class_1_Primary_CA.cer b/Windows/System/Certs/Class_1_Primary_CA.cer
new file mode 100644
index 0000000000000000000000000000000000000000..3b1c7b2245d4593b2b6618e295072542f02af2c2
Binary files /dev/null and b/Windows/System/Certs/Class_1_Primary_CA.cer differ
diff --git a/Windows/System/Certs/ROOTCA.cer b/Windows/System/Certs/ROOTCA.cer
new file mode 100644
index 0000000000000000000000000000000000000000..2681e721eed2f3dc7071137640622b36584e01af
Binary files /dev/null and b/Windows/System/Certs/ROOTCA.cer differ
diff --git a/Windows/System/Certs/SRCA.cer b/Windows/System/Certs/SRCA.cer
new file mode 100644
index 0000000000000000000000000000000000000000..9f051affeb71229a480d010ae58f63d2a80ea174
Binary files /dev/null and b/Windows/System/Certs/SRCA.cer differ
diff --git a/Windows/System/Certs/UCA_EV_Root.cer b/Windows/System/Certs/UCA_EV_Root.cer
new file mode 100644
index 0000000000000000000000000000000000000000..6a2e92a3ee5f2049d0cbc4646faa8e4b37195592
Binary files /dev/null and b/Windows/System/Certs/UCA_EV_Root.cer differ
diff --git a/Windows/System/Certs/UCA_Global_Root.cer b/Windows/System/Certs/UCA_Global_Root.cer
new file mode 100644
index 0000000000000000000000000000000000000000..7f3cc92dc3f404d224d183ad21351c5c76b125ab
Binary files /dev/null and b/Windows/System/Certs/UCA_Global_Root.cer differ
diff --git a/Windows/System/Certs/UCA_Root.cer b/Windows/System/Certs/UCA_Root.cer
new file mode 100644
index 0000000000000000000000000000000000000000..3105a1e54b9e6db0a1c5718dea0de00764ac386b
Binary files /dev/null and b/Windows/System/Certs/UCA_Root.cer differ
diff --git a/Windows/System/Microsoft_Fixit_20135.diagcab b/Windows/System/Microsoft_Fixit_20135.diagcab
new file mode 100644
index 0000000000000000000000000000000000000000..64a7f3ecc0628e4d45675d82fb5405dc387563ed
Binary files /dev/null and b/Windows/System/Microsoft_Fixit_20135.diagcab differ
diff --git a/Windows/System/Microsoft_Fixit_51014.msi b/Windows/System/Microsoft_Fixit_51014.msi
new file mode 100644
index 0000000000000000000000000000000000000000..c1aba7e01019a867325ff4d538111a6ca553e40c
Binary files /dev/null and b/Windows/System/Microsoft_Fixit_51014.msi differ
diff --git a/Windows/System/RootSUPD_March_2014.exe b/Windows/System/RootSUPD_March_2014.exe
new file mode 100644
index 0000000000000000000000000000000000000000..ff0c98b881b7498ef917112cbcf9c03307aa4d92
Binary files /dev/null and b/Windows/System/RootSUPD_March_2014.exe differ