diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 32da4bb..d5c3a72 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="93b7bb07-655b-4d5a-8244-85210ae64a22" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gopup/index/index_baidu.py" beforeDir="false" afterPath="$PROJECT_DIR$/gopup/index/index_baidu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gopup/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/gopup/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gopup/economic/marco_cn.py" beforeDir="false" afterPath="$PROJECT_DIR$/gopup/economic/marco_cn.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -20,7 +20,7 @@
     <SUITE FILE_PATH="coverage/gopup$covid.coverage" NAME="covid Coverage Results" MODIFIED="1608699253927" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/gopup/event" />
     <SUITE FILE_PATH="coverage/gopup$index_weibo.coverage" NAME="index_weibo Coverage Results" MODIFIED="1584754022578" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/gopup/index" />
     <SUITE FILE_PATH="coverage/gopup$test.coverage" NAME="test Coverage Results" MODIFIED="1603251064346" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/example" />
-    <SUITE FILE_PATH="coverage/gopup$marco_cn.coverage" NAME="marco_cn Coverage Results" MODIFIED="1608559851596" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/gopup/economic" />
+    <SUITE FILE_PATH="coverage/gopup$marco_cn.coverage" NAME="marco_cn Coverage Results" MODIFIED="1609384139254" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/gopup/economic" />
     <SUITE FILE_PATH="coverage/gopup$insert_symbols.coverage" NAME="insert_symbols Coverage Results" MODIFIED="1585030978117" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="D:/视频课程/199_Python3量化/03_配套源码/第03课代码" />
     <SUITE FILE_PATH="coverage/gopup$netbase.coverage" NAME="netbase Coverage Results" MODIFIED="1585313049837" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/gopup/utils" />
     <SUITE FILE_PATH="coverage/gopup$my_fun.coverage" NAME="my_fun Coverage Results" MODIFIED="1605926238761" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/gopup" />
@@ -36,37 +36,80 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/gopup/index/index_baidu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="915">
+            <state relative-caret-position="328">
               <caret line="345" column="6" selection-start-line="345" selection-start-column="6" selection-end-line="345" selection-end-column="6" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gopup/life/oil.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="58" column="32" lean-forward="true" selection-start-line="58" selection-start-column="32" selection-end-line="58" selection-end-column="32" />
               <folding>
-                <element signature="e#159#170#0" expanded="true" />
-                <element signature="e#6399#7922#0" />
-                <element signature="e#10658#11910#0" />
+                <element signature="e#151#162#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gopup/economic/marco_cn.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1784">
+              <caret line="224" column="76" lean-forward="true" selection-start-line="224" selection-start-column="76" selection-end-line="224" selection-end-column="85" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gopup/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="362">
+              <caret line="78" column="33" lean-forward="true" selection-start-line="78" selection-start-column="33" selection-end-line="78" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gopup/economic/shibor.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-556">
+              <caret line="31" column="14" lean-forward="true" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gopup/economic/cons.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="173">
+              <caret line="11" selection-start-line="11" selection-end-line="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="84">
-                <caret line="101" column="14" selection-start-line="101" selection-start-column="14" selection-end-line="101" selection-end-column="14" />
+              <first_editor relative-caret-position="966">
+                <caret line="107" column="4" selection-start-line="107" selection-start-column="4" selection-end-line="108" selection-end-column="85" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/setup.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+            <state relative-caret-position="126">
+              <caret line="15" column="50" lean-forward="true" selection-start-line="15" selection-start-column="50" selection-end-line="16" selection-end-column="35" />
               <folding>
                 <element signature="e#153#196#0" expanded="true" />
               </folding>
@@ -97,10 +140,12 @@
       <find>index_toutiao_headers</find>
       <find>marco_cmlrd</find>
       <find>covid_163</find>
+      <find>eastmoney.com</find>
+      <find>exchange_rate</find>
     </findStrings>
     <dirStrings>
-      <dir>D:\pythonFile\gopup</dir>
       <dir>D:\pythonFile\gopup\gopup</dir>
+      <dir>D:\pythonFile\gopup</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -120,12 +165,12 @@
         <option value="$PROJECT_DIR$/example/test.py" />
         <option value="$PROJECT_DIR$/gopup/life/charity.py" />
         <option value="$PROJECT_DIR$/gopup/index/cons.py" />
-        <option value="$PROJECT_DIR$/gopup/__init__.py" />
         <option value="$PROJECT_DIR$/gopup/index/index_toutiao.py" />
-        <option value="$PROJECT_DIR$/gopup/economic/marco_cn.py" />
         <option value="$PROJECT_DIR$/gopup/event/covid.py" />
         <option value="$PROJECT_DIR$/gopup/index/index_baidu.py" />
+        <option value="$PROJECT_DIR$/gopup/__init__.py" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/gopup/economic/marco_cn.py" />
         <option value="$PROJECT_DIR$/setup.py" />
       </list>
     </option>
@@ -145,7 +190,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -168,6 +212,12 @@
               <item name="gopup" type="462c0819:PsiDirectoryNode" />
               <item name="gopup" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="gopup" type="b2602c69:ProjectViewProjectNode" />
+              <item name="gopup" type="462c0819:PsiDirectoryNode" />
+              <item name="gopup" type="462c0819:PsiDirectoryNode" />
+              <item name="economic" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="gopup" type="b2602c69:ProjectViewProjectNode" />
               <item name="gopup" type="462c0819:PsiDirectoryNode" />
@@ -178,6 +228,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="ProjectViewState">
@@ -218,7 +269,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.index_baidu">
+  <component name="RunManager" selected="Python.marco_cn">
     <configuration name="charity" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="gopup" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -331,9 +382,9 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.marco_cn" />
         <item itemvalue="Python.index_baidu" />
         <item itemvalue="Python.covid" />
-        <item itemvalue="Python.marco_cn" />
         <item itemvalue="Python.index_toutiao" />
         <item itemvalue="Python.charity" />
       </list>
@@ -395,11 +446,12 @@
       <workItem from="1608773984236" duration="43000" />
       <workItem from="1608774302380" duration="608000" />
       <workItem from="1608858937747" duration="5544000" />
+      <workItem from="1609377004565" duration="8490000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="172677000" />
+    <option name="totallyTimeSpent" value="181167000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -413,13 +465,13 @@
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1376" height="754" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21504559" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21808511" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32903227" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.4016129" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.32096773" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.66290325" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.48387095" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -427,12 +479,12 @@
       <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.32419354" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="11" visible="true" weight="0.4483871" />
       <window_info anchor="bottom" id="Python Console" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="SciView" order="3" weight="0.32978722" />
+      <window_info anchor="right" id="SciView" order="3" weight="0.575228" />
       <window_info anchor="right" id="Database" order="4" />
     </layout>
   </component>
@@ -690,29 +742,9 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
-          <line>205</line>
+          <line>82</line>
           <option name="timeStamp" value="107" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
-          <line>207</line>
-          <option name="timeStamp" value="108" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
-          <line>208</line>
-          <option name="timeStamp" value="109" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
-          <line>209</line>
-          <option name="timeStamp" value="110" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
-          <line>418</line>
-          <option name="timeStamp" value="111" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/gopup/event/covid.py</url>
           <line>212</line>
@@ -843,6 +875,36 @@
           <line>296</line>
           <option name="timeStamp" value="179" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
+          <line>89</line>
+          <option name="timeStamp" value="181" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
+          <line>90</line>
+          <option name="timeStamp" value="182" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
+          <line>110</line>
+          <option name="timeStamp" value="187" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
+          <line>111</line>
+          <option name="timeStamp" value="188" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
+          <line>113</line>
+          <option name="timeStamp" value="189" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/gopup/economic/marco_cn.py</url>
+          <line>232</line>
+          <option name="timeStamp" value="190" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -905,16 +967,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gopup/life/oil.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="33" selection-end-column="62" />
-          <folding>
-            <element signature="e#151#162#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/test.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
@@ -990,9 +1042,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gopup/economic/shibor.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/gopup/event/area_baidu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
@@ -1028,13 +1077,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gopup/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="29" column="21" selection-start-line="29" selection-start-column="21" selection-end-line="29" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gopup/index/index_toutiao.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -1055,41 +1097,67 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gopup/economic/marco_cn.py">
+    <entry file="file://$PROJECT_DIR$/gopup/index/index_baidu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="432" column="21" selection-start-line="432" selection-start-column="21" selection-end-line="432" selection-end-column="21" />
+        <state relative-caret-position="328">
+          <caret line="345" column="6" selection-start-line="345" selection-start-column="6" selection-end-line="345" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gopup/economic/cons.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="173">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gopup/economic/shibor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-556">
+          <caret line="31" column="14" lean-forward="true" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gopup/life/oil.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="58" column="32" lean-forward="true" selection-start-line="58" selection-start-column="32" selection-end-line="58" selection-end-column="32" />
+          <folding>
+            <element signature="e#151#162#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gopup/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="78" column="33" lean-forward="true" selection-start-line="78" selection-start-column="33" selection-end-line="78" selection-end-column="33" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="84">
-            <caret line="101" column="14" selection-start-line="101" selection-start-column="14" selection-end-line="101" selection-end-column="14" />
+          <first_editor relative-caret-position="966">
+            <caret line="107" column="4" selection-start-line="107" selection-start-column="4" selection-end-line="108" selection-end-column="85" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/setup.py">
+    <entry file="file://$PROJECT_DIR$/gopup/economic/marco_cn.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
-          <folding>
-            <element signature="e#153#196#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1784">
+          <caret line="224" column="76" lean-forward="true" selection-start-line="224" selection-start-column="76" selection-end-line="224" selection-end-column="85" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gopup/index/index_baidu.py">
+    <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="915">
-          <caret line="345" column="6" selection-start-line="345" selection-start-column="6" selection-end-line="345" selection-end-column="6" />
+        <state relative-caret-position="126">
+          <caret line="15" column="50" lean-forward="true" selection-start-line="15" selection-start-column="50" selection-end-line="16" selection-end-column="35" />
           <folding>
-            <element signature="e#159#170#0" expanded="true" />
-            <element signature="e#6399#7922#0" />
-            <element signature="e#10658#11910#0" />
+            <element signature="e#153#196#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/README.md b/README.md
index 3d2de7b..cbffa82 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,13 @@ print(df)
 - 宏观数据
     - 中国宏观数据
         - 中国宏观杠杆率数据
+        - 国内生产总值数据
+        - 居民消费价格指数(CPI)
+        - 工业品出厂价格指数(PPI)
+        - 采购经理人指数(PMI)
+        - 存款准备金率数据
+        - 货币供应量数据
+        - 外汇储备数据
         - 货币汇率数据
     - 利率数据
         - Shibor数据
@@ -97,6 +104,9 @@ print(df)
     
     
 #### 版本更新
+
+    0.3.0
+    中国宏观数据：国内生产总值数据、居民消费价格指数(CPI)、工业品出厂价格指数(PPI)、采购经理人指数(PMI)、存款准备金率数据、货币供应量数据、外汇储备数据
     
     0.2.9.1
     迭代百度指数解析问题
diff --git a/gopup/__init__.py b/gopup/__init__.py
index a2065f3..4a474e7 100644
--- a/gopup/__init__.py
+++ b/gopup/__init__.py
@@ -70,18 +70,12 @@
 """
 from gopup.economic.marco_cn import (
     marco_cmlrd,
-    get_gdp_year,
     get_gdp_quarter,
-    get_gdp_for,
-    get_gdp_pull,
-    get_gdp_contrib,
     get_cpi,
     get_ppi,
-    get_deposit_rate,
-    get_loan_rate,
+    get_pmi,
     get_rrr,
     get_money_supply,
-    get_money_supply_bal,
     get_gold_and_foreign_reserves
 )
 
diff --git a/gopup/economic/marco_cn.py b/gopup/economic/marco_cn.py
index 75cf3ee..bcc2f02 100644
--- a/gopup/economic/marco_cn.py
+++ b/gopup/economic/marco_cn.py
@@ -35,184 +35,60 @@ def marco_cmlrd():
     return excel_data
 
 
-def get_gdp_year():
-    """
-    获取年度国内生产总值数据
-    --------
-    DataFrame
-    year :统计年度
-    gdp :国内生产总值(亿元)
-    pc_gdp :人均国内生产总值(元)
-    gnp :国民生产总值(亿元)
-    pi :第一产业(亿元)
-    si :第二产业(亿元)
-    industry :工业(亿元)
-    cons_industry :建筑业(亿元)
-    ti :第三产业(亿元)
-    trans_industry :交通运输仓储邮电通信业(亿元)
-    lbdy :批发零售贸易及餐饮业(亿元)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[0], 0, 70,
-                                    rdint))
-    text = r.text
-    # # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    datastr = datastr.replace('"', '').replace('null', '0')
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.GDP_YEAR_COLS)
-    df[df==0] = np.NaN
-    return df
-
-
 def get_gdp_quarter():
     """
     获取季度国内生产总值数据
     --------
     DataFrame
-    quarter :季度
-    gdp :国内生产总值(亿元)
-    gdp_yoy :国内生产总值同比增长(%)
-    pi :第一产业增加值(亿元)
-    pi_yoy:第一产业增加值同比增长(%)
-    si :第二产业增加值(亿元)
-    si_yoy :第二产业增加值同比增长(%)
-    ti :第三产业增加值(亿元)
-    ti_yoy :第三产业增加值同比增长(%)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[0], 1, 250,
-                                    rdint))
-    text = r.text
-    # # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    datastr = datastr.replace('"', '').replace('null', '0')
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.GDP_QUARTER_COLS)
-    df['quarter'] = df['quarter'].astype(object)
-    df[df==0] = np.NaN
-    url = cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[0], 1, 250,
-                                    rdint)
-    return df
-
-
-def get_gdp_for():
-    """
-    获取三大需求对GDP贡献数据
-    --------
-    DataFrame
-        year :统计年度
-        end_for :最终消费支出贡献率(%)
-        for_rate :最终消费支出拉动(百分点)
-        asset_for :资本形成总额贡献率(%)
-        asset_rate:资本形成总额拉动(百分点)
-        goods_for :货物和服务净出口贡献率(%)
-        goods_rate :货物和服务净出口拉动(百分点)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL % (cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                      rdint, cons.MACRO_TYPE[0], 4, 80, rdint))
-    text = r.text
-    # # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    datastr = datastr.replace('"', '').replace('null', '0')
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.GDP_FOR_COLS)
-    df[df == 0] = np.NaN
-    return df
-
-
-def get_gdp_pull():
-    """
-    获取三大产业对GDP拉动数据
-    --------
-    DataFrame
-        year :统计年度
-        gdp_yoy :国内生产总值同比增长(%)
-        pi :第一产业拉动率(%)
-        si :第二产业拉动率(%)
-        industry:其中工业拉动(%)
-        ti :第三产业拉动率(%)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL % (cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                      rdint, cons.MACRO_TYPE[0], 5, 60, rdint))
-    text = r.text
-    # # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    datastr = datastr.replace('"', '').replace('null', '0')
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.GDP_PULL_COLS)
-    df[df == 0] = np.NaN
-
-    return df
-
-
-def get_gdp_contrib():
-    """
-        获取三大产业贡献率数据
-    --------
-    DataFrame
-        year :统计年度
-        gdp_yoy :国内生产总值
-        pi :第一产业献率(%)
-        si :第二产业献率(%)
-        industry:其中工业献率(%)
-        ti :第三产业献率(%)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'], rdint,
-                                    cons.MACRO_TYPE[0], 6, 60, rdint))
-    text = r.text
-    # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    datastr = datastr.replace('"', '').replace('null', '0')
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.GDP_CONTRIB_COLS)
-    df[df==0] = np.NaN
-    return df
+        month :统计月份
+        cpi : "季度", "国内生产总值 绝对值(亿元)", "国内生产总值 同比增长", "第一产业 绝对值(亿元)", "第一产业 同比增长", "第二产业 绝对值(亿元)", "第二产业 同比增长", "第三产业 绝对值(亿元)", "第三产业 同比增长"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "20"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[")+2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["季度", "国内生产总值 绝对值(亿元)", "国内生产总值 同比增长", "第一产业 绝对值(亿元)", "第一产业 同比增长", "第二产业 绝对值(亿元)", "第二产业 同比增长", "第三产业 绝对值(亿元)", "第三产业 同比增长"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
 
 
 def get_cpi():
     """
-        获取居民消费价格指数数据
+        获取居民消费价格指数数据（CPI）
     --------
     DataFrame
         month :统计月份
-        cpi :价格指数
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[1], 0, 600,
-                                    rdint))
-    text = r.text
-    # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.CPI_COLS)
-    df['cpi'] = df['cpi'].astype(float)
-    return df
+        cpi : "月份", "全国当月", "全国同比增长", "全国环比增长", "全国累计", "城市当月", "城市同比增长", "城市环比增长", "城市累计", "农村当月", "农村同比增长", "农村环比增长", "农村累计"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "19"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[")+2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["月份", "全国当月", "全国同比增长", "全国环比增长", "全国累计", "城市当月", "城市同比增长", "城市环比增长", "城市累计", "农村当月", "农村同比增长", "农村环比增长", "农村累计"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
 
 
 def get_ppi():
@@ -220,87 +96,53 @@ def get_ppi():
         获取工业品出厂价格指数数据
     --------
     DataFrame
-        month :统计月份
-        ppiip :工业品出厂价格指数
-        ppi :生产资料价格指数
-        qm:采掘工业价格指数
-        rmi:原材料工业价格指数
-        pi:加工工业价格指数
-        cg:生活资料价格指数
-        food:食品类价格指数
-        clothing:衣着类价格指数
-        roeu:一般日用品价格指数
-        dcg:耐用消费品价格指数
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[1], 3, 600,
-                                    rdint))
-    text = r.text
-    # # text = text.decode('gbk') if ct.PY3 else text
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.PPI_COLS)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x:np.where(x is None, np.NaN, x))
-        if i != 'month':
-            df[i] = df[i].astype(float)
-    return df
-
-
-def get_deposit_rate():
-    """
-        获取存款利率数据
-    --------
-    DataFrame
-        date :变动日期
-        deposit_type :存款种类
-        rate:利率（%）
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[2], 2, 600,
-                                    rdint))
-    text = r.text
-    # text = text.decode('gbk')
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.DEPOSIT_COLS)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x:np.where(x is None, '--', x))
-    return df
-
-
-def get_loan_rate():
-    """
-        获取贷款利率数据
+        "月份", "当月", "当月同比增长", "累计"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "22"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[") + 2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["月份", "当月", "当月同比增长", "累计"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
+
+
+def get_pmi():
+    """
+        获取采购经理人指数(PMI)
     --------
     DataFrame
-        date :执行日期
-        loan_type :存款种类
-        rate:利率（%）
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[2], 3, 800,
-                                    rdint))
-    text = r.text
-    # text = text.decode('gbk')
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.LOAN_COLS)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x:np.where(x is None, '--', x))
-    return df
+        "月份", "制造业指数", "制造业同比增长", "非制造业指数", "非制造业同比增长"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "21"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[") + 2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["月份", "制造业指数", "制造业同比增长", "非制造业指数", "非制造业同比增长"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
 
 
 def get_rrr():
@@ -308,26 +150,26 @@ def get_rrr():
         获取存款准备金率数据
     --------
     DataFrame
-        date :变动日期
-        before :调整前存款准备金率(%)
-        now:调整后存款准备金率(%)
-        changed:调整幅度(%)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[2], 4, 100,
-                                    rdint))
-    text = r.text
-    # text = text.decode('gbk')
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.RRR_COLS)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x:np.where(x is None, '--', x))
-    return df
+        "公布时间", "生效时间", "大型金融机构 调整前", "大型金融机构 调整后", "大型金融机构 调整幅度", "中小型金融机构 调整前", "中小型金融机构 调整后", "中小型金融机构 调整幅度", "备注", "消息公布次日指数涨跌 上证", "消息公布次日指数涨跌 深证"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "23"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[") + 2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["公布时间", "生效时间", "大型金融机构 调整前", "大型金融机构 调整后", "大型金融机构 调整幅度", "中小型金融机构 调整前", "中小型金融机构 调整后", "中小型金融机构 调整幅度", "备注", "消息公布次日指数涨跌 上证", "消息公布次日指数涨跌 深证"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
 
 
 def get_money_supply():
@@ -335,71 +177,26 @@ def get_money_supply():
         获取货币供应量数据
     --------
     DataFrame
-        month :统计时间
-        m2 :货币和准货币（广义货币M2）(亿元)
-        m2_yoy:货币和准货币（广义货币M2）同比增长(%)
-        m1:货币(狭义货币M1)(亿元)
-        m1_yoy:货币(狭义货币M1)同比增长(%)
-        m0:流通中现金(M0)(亿元)
-        m0_yoy:流通中现金(M0)同比增长(%)
-        cd:活期存款(亿元)
-        cd_yoy:活期存款同比增长(%)
-        qm:准货币(亿元)
-        qm_yoy:准货币同比增长(%)
-        ftd:定期存款(亿元)
-        ftd_yoy:定期存款同比增长(%)
-        sd:储蓄存款(亿元)
-        sd_yoy:储蓄存款同比增长(%)
-        rests:其他存款(亿元)
-        rests_yoy:其他存款同比增长(%)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[2], 1, 600,
-                                    rdint))
-    text = r.text
-    # text = text.decode('gbk')
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.MONEY_SUPPLY_COLS)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x:np.where(x is None, '--', x))
-    return df
-
-
-def get_money_supply_bal():
-    """
-        获取货币供应量(年底余额)数据
-    --------
-    DataFrame
-        year :统计年度
-        m2 :货币和准货币(亿元)
-        m1:货币(亿元)
-        m0:流通中现金(亿元)
-        cd:活期存款(亿元)
-        qm:准货币(亿元)
-        ftd:定期存款(亿元)
-        sd:储蓄存款(亿元)
-        rests:其他存款(亿元)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL%(cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                    rdint, cons.MACRO_TYPE[2], 0, 200,
-                                    rdint))
-    text = r.text
-    # text = text.decode('gbk')
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.MONEY_SUPPLY_BLA_COLS)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x:np.where(x is None, '--', x))
-    return df
+        "月份", "货币和准货币(M2) 数量(亿元)", "货币和准货币(M2) 同比增长", "货币和准货币(M2) 环比增长", "货币(M1) 数量(亿元)", "货币(M1) 同比增长	", "货币(M1) 环比增长", "流通中的现金(M0) 数量(亿元)", "流通中的现金(M0) 同比增长", "流通中的现金(M0) 环比增长"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "11"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[") + 2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["月份", "货币和准货币(M2) 数量(亿元)", "货币和准货币(M2) 同比增长", "货币和准货币(M2) 环比增长", "货币(M1) 数量(亿元)", "货币(M1) 同比增长	", "货币(M1) 环比增长", "流通中的现金(M0) 数量(亿元)", "流通中的现金(M0) 同比增长", "流通中的现金(M0) 环比增长"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
 
 
 def get_gold_and_foreign_reserves():
@@ -408,29 +205,30 @@ def get_gold_and_foreign_reserves():
     Returns
     -------
     DataFrame
-        month :统计时间
-        gold:黄金储备(万盎司)
-        foreign_reserves:外汇储备(亿美元)
-    """
-    rdint = cons.random()
-    r = requests.get(cons.MACRO_URL % (cons.P_TYPE['http'], cons.DOMAINS['sina'],
-                                      rdint, cons.MACRO_TYPE[2], 5, 200,
-                                      rdint))
-    text = r.text
-    # text = r.decode('gbk')
-    regSym = re.compile(r'\,count:(.*?)\}')
-    datastr = regSym.findall(text)
-    datastr = datastr[0]
-    datastr = datastr.split('data:')[1]
-    js = json.loads(datastr)
-    df = pd.DataFrame(js, columns=cons.GOLD_AND_FOREIGN_CURRENCY_RESERVES)
-    for i in df.columns:
-        df[i] = df[i].apply(lambda x: np.where(x is None, '--', x))
-    return df
+        "月份", "国家外汇储备(亿美元) 数值", "国家外汇储备(亿美元) 同比", "国家外汇储备(亿美元) 环比", "黄金储备(万盎司) 数值", "黄金储备(万盎司) 同比", "黄金储备(万盎司) 环比"
+    """
+    url = "http://datainterface.eastmoney.com/EM_DataCenter/JS.aspx"
+    params = {
+        "type": "GJZB",
+        "sty": "ZGZB",
+        "p": "1",
+        "ps": "200",
+        "mkt": "16"
+    }
+    r = requests.get(url=url, params=params)
+    data_text = r.text
+    tmp_list = data_text[data_text.find("[") + 2: -3]
+    tmp_list = tmp_list.split('","')
+    res_list = []
+    for li in tmp_list:
+        res_list.append(li.split(','))
+    columns = ["月份", "国家外汇储备(亿美元) 数值", "国家外汇储备(亿美元) 同比", "国家外汇储备(亿美元) 环比", "黄金储备(万盎司) 数值", "黄金储备(万盎司) 同比", "黄金储备(万盎司) 环比"]
+    data_df = pd.DataFrame(res_list, columns=columns)
+    return data_df
 
 
 if __name__ == '__main__':
-    tmp = marco_cmlrd()
+    tmp = get_rrr()
 
     print(tmp)
 
diff --git a/setup.py b/setup.py
index 498081d..709d0cc 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 URL = 'https://github.com/justinzm/gopup'
 NAME = 'gopup'
-VERSION = '0.2.9.1'
+VERSION = '0.3.0'
 DESCRIPTION = 'GoPUP database'
 if os.path.exists('README.md'):
     with open('README.md', encoding='utf-8') as f: