diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b553324..62256bd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AceStream.py" afterPath="$PROJECT_DIR$/AceStream.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/utorrent/net.py" afterPath="$PROJECT_DIR$/resources/utorrent/net.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="plugin.video.torrenter.iws" />
@@ -35,53 +35,12 @@
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf>
-          <file leaf-file-name="Core.py" pinned="false" current="false" current-in-tab="false">
+          <file leaf-file-name="Core.py" pinned="false" current="true" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/Core.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-6.071429" vertical-offset="2754" max-vertical-offset="4012">
-                  <caret line="1401" column="47" selection-start-line="1401" selection-start-column="47" selection-end-line="1401" selection-end-column="47" />
-                  <folding>
-                    <element signature="e#24#781#1" expanded="false" />
-                    <element signature="e#2318#2615#0" expanded="false" />
-                    <element signature="e#2652#7286#0" expanded="false" />
-                    <element signature="e#7325#19290#0" expanded="false" />
-                    <element signature="e#19331#20097#0" expanded="false" />
-                    <element signature="e#20148#27163#0" expanded="false" />
-                    <element signature="e#27207#30636#0" expanded="false" />
-                    <element signature="e#30677#31904#0" expanded="false" />
-                    <element signature="e#32004#36358#0" expanded="false" />
-                    <element signature="e#36406#38470#0" expanded="false" />
-                    <element signature="e#38512#39500#0" expanded="false" />
-                    <element signature="e#39550#44164#0" expanded="false" />
-                    <element signature="e#44229#50582#0" expanded="false" />
-                    <element signature="e#50630#51365#0" expanded="false" />
-                    <element signature="e#51429#53484#0" expanded="false" />
-                    <element signature="e#53533#55492#0" expanded="false" />
-                    <element signature="e#55649#56901#0" expanded="false" />
-                    <element signature="e#56957#57374#0" expanded="false" />
-                    <element signature="e#57416#57525#0" expanded="false" />
-                    <element signature="e#57568#57688#0" expanded="false" />
-                    <element signature="e#57738#57889#0" expanded="false" />
-                    <element signature="e#57942#65696#0" expanded="false" />
-                    <element signature="e#65745#65784#0" expanded="false" />
-                    <element signature="e#65833#66623#0" expanded="false" />
-                    <element signature="e#66673#69473#0" expanded="false" />
-                    <element signature="e#69518#70267#0" expanded="false" />
-                    <element signature="e#70315#71811#0" expanded="false" />
-                    <element signature="e#71856#72729#0" expanded="false" />
-                    <element signature="e#79045#80829#0" expanded="false" />
-                    <element signature="e#80879#80975#0" expanded="false" />
-                    <element signature="e#81038#81565#0" expanded="false" />
-                    <element signature="e#81636#86924#0" expanded="false" />
-                    <element signature="e#86968#87025#0" expanded="false" />
-                    <element signature="e#87079#90428#0" expanded="false" />
-                    <element signature="e#90483#92414#0" expanded="false" />
-                    <element signature="e#92480#93100#0" expanded="false" />
-                    <element signature="e#93143#94041#0" expanded="false" />
-                    <element signature="e#94077#94866#0" expanded="false" />
-                    <element signature="e#94908#95003#0" expanded="false" />
-                    <element signature="e#95053#95201#0" expanded="false" />
-                  </folding>
+                <state vertical-scroll-proportion="0.56962025" vertical-offset="26648" max-vertical-offset="29903">
+                  <caret line="1608" column="46" selection-start-line="1608" selection-start-column="46" selection-end-line="1608" selection-end-column="46" />
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -89,7 +48,7 @@
           <file leaf-file-name="Downloader.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Downloader.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="2278">
+                <state vertical-scroll-proportion="0.0" vertical-offset="1326" max-vertical-offset="2329">
                   <caret line="78" column="8" selection-start-line="78" selection-start-column="8" selection-end-line="78" selection-end-column="8" />
                   <folding />
                 </state>
@@ -99,7 +58,7 @@
           <file leaf-file-name="Localization.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Localization.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="62.07143" vertical-offset="3234" max-vertical-offset="4046">
+                <state vertical-scroll-proportion="0.0" vertical-offset="3234" max-vertical-offset="4046">
                   <caret line="88" column="23" selection-start-line="88" selection-start-column="23" selection-end-line="88" selection-end-column="23" />
                   <folding />
                 </state>
@@ -110,17 +69,17 @@
             <entry file="file://$PROJECT_DIR$/addon.xml">
               <provider selected="true" editor-type-id="text-editor">
                 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
-                  <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+                  <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="AceStream.py" pinned="false" current="false" current-in-tab="true">
+          <file leaf-file-name="AceStream.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/AceStream.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.45899633" vertical-offset="1274" max-vertical-offset="2448">
-                  <caret line="110" column="25" selection-start-line="110" selection-start-column="25" selection-end-line="110" selection-end-column="25" />
+                <state vertical-scroll-proportion="0.0" vertical-offset="2040" max-vertical-offset="2669">
+                  <caret line="120" column="46" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
                   <folding />
                 </state>
               </provider>
@@ -139,7 +98,7 @@
           <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/resources/language/Russian/strings.xml">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="252" max-vertical-offset="1105">
+                <state vertical-scroll-proportion="0.0" vertical-offset="629" max-vertical-offset="1105">
                   <caret line="37" column="48" selection-start-line="37" selection-start-column="48" selection-end-line="37" selection-end-column="48" />
                   <folding />
                 </state>
@@ -153,23 +112,33 @@
           <file leaf-file-name="SearcherABC.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/SearcherABC.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0" vertical-offset="1309" max-vertical-offset="3485">
+                <state vertical-scroll-proportion="0.0" vertical-offset="1581" max-vertical-offset="3757">
                   <caret line="93" column="52" selection-start-line="93" selection-start-column="52" selection-end-line="93" selection-end-column="52" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="Libtorrent.py" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="Libtorrent.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Libtorrent.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.44047618" vertical-offset="1228" max-vertical-offset="7310">
+                <state vertical-scroll-proportion="0.0" vertical-offset="1598" max-vertical-offset="7310">
                   <caret line="108" column="43" selection-start-line="108" selection-start-column="43" selection-end-line="108" selection-end-column="43" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="net.py" pinned="false" current="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.6051661" vertical-offset="14536" max-vertical-offset="22576">
+                  <caret line="900" column="16" selection-start-line="900" selection-start-column="8" selection-end-line="900" selection-end-column="16" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
           <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/resources/language/English/strings.xml">
               <provider selected="true" editor-type-id="text-editor">
@@ -202,7 +171,6 @@
         <option value="$PROJECT_DIR$/resources/searchers/NNMClubRu.py" />
         <option value="$PROJECT_DIR$/Downloader.py" />
         <option value="$PROJECT_DIR$/resources/searchers/KickAssSo.py" />
-        <option value="$PROJECT_DIR$/resources/utorrent/net.py" />
         <option value="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
         <option value="$PROJECT_DIR$/Content.py" />
         <option value="$PROJECT_DIR$/resources/contenters/KickAssSo.py" />
@@ -210,7 +178,6 @@
         <option value="$PROJECT_DIR$/resources/settings.xml" />
         <option value="$PROJECT_DIR$/resources/searchers/T411FR.py" />
         <option value="$PROJECT_DIR$/changelog.txt" />
-        <option value="$PROJECT_DIR$/addon.xml" />
         <option value="$PROJECT_DIR$/Libtorrent.py" />
         <option value="$PROJECT_DIR$/resources/contenters/EZTV.py" />
         <option value="$PROJECT_DIR$/resources/searchers/EZTV.py" />
@@ -220,6 +187,8 @@
         <option value="$PROJECT_DIR$/Localization.py" />
         <option value="$PROJECT_DIR$/Core.py" />
         <option value="$PROJECT_DIR$/AceStream.py" />
+        <option value="$PROJECT_DIR$/addon.xml" />
+        <option value="$PROJECT_DIR$/resources/utorrent/net.py" />
       </list>
     </option>
   </component>
@@ -274,6 +243,38 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugin.video.torrenter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="utorrent" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -564,7 +565,11 @@
       <created>1421688808925</created>
       <updated>1421688808925</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="ace stream fix">
+      <created>1421703999627</created>
+      <updated>1421703999627</updated>
+    </task>
+    <option name="localTasksCounter" value="29" />
     <servers />
   </component>
   <component name="TodoView" selected-index="0">
@@ -591,7 +596,6 @@
     <frame x="1" y="1" width="1918" height="1038" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26140156" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3288889" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -606,6 +610,7 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -648,7 +653,8 @@
     <MESSAGE value="subs new naming" />
     <MESSAGE value="myshows external fix" />
     <MESSAGE value="TC copy files from subfold" />
-    <option name="LAST_COMMIT_MESSAGE" value="TC copy files from subfold" />
+    <MESSAGE value="ace stream fix" />
+    <option name="LAST_COMMIT_MESSAGE" value="ace stream fix" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -660,28 +666,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2176" max-vertical-offset="6375">
           <caret line="128" column="38" selection-start-line="128" selection-start-column="38" selection-end-line="128" selection-end-column="38" />
-          <folding>
-            <element signature="e#1861#2039#0" expanded="false" />
-            <element signature="e#2069#2247#0" expanded="false" />
-            <element signature="e#2278#2289#0" expanded="false" />
-            <element signature="e#2333#2350#0" expanded="false" />
-            <element signature="e#2403#2495#0" expanded="false" />
-            <element signature="e#2570#2841#0" expanded="false" />
-            <element signature="e#3603#5700#0" expanded="false" />
-            <element signature="e#5731#6122#0" expanded="false" />
-            <element signature="e#6161#6832#0" expanded="false" />
-            <element signature="e#6864#9288#0" expanded="false" />
-            <element signature="e#10674#12765#0" expanded="false" />
-            <element signature="e#12808#12915#0" expanded="false" />
-            <element signature="e#12958#13041#0" expanded="false" />
-            <element signature="e#13083#13190#0" expanded="false" />
-            <element signature="e#13233#13340#0" expanded="false" />
-            <element signature="e#13411#13544#0" expanded="false" />
-            <element signature="e#15816#16288#0" expanded="false" />
-            <element signature="e#16323#16418#0" expanded="false" />
-            <element signature="e#16459#16787#0" expanded="false" />
-            <element signature="e#16820#17487#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -719,48 +703,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="27387">
           <caret line="1071" column="32" selection-start-line="1071" selection-start-column="32" selection-end-line="1071" selection-end-column="32" />
-          <folding>
-            <element signature="e#24#781#1" expanded="false" />
-            <element signature="e#2318#2615#0" expanded="false" />
-            <element signature="e#2652#7286#0" expanded="false" />
-            <element signature="e#7325#19290#0" expanded="false" />
-            <element signature="e#19331#20097#0" expanded="false" />
-            <element signature="e#20148#27163#0" expanded="false" />
-            <element signature="e#27207#30636#0" expanded="false" />
-            <element signature="e#30677#31904#0" expanded="false" />
-            <element signature="e#32004#36358#0" expanded="false" />
-            <element signature="e#36406#38470#0" expanded="false" />
-            <element signature="e#38512#39500#0" expanded="false" />
-            <element signature="e#39550#44164#0" expanded="false" />
-            <element signature="e#44229#50582#0" expanded="false" />
-            <element signature="e#50630#51365#0" expanded="false" />
-            <element signature="e#51429#53484#0" expanded="false" />
-            <element signature="e#53533#55492#0" expanded="false" />
-            <element signature="e#55649#56901#0" expanded="false" />
-            <element signature="e#56957#57374#0" expanded="false" />
-            <element signature="e#57416#57525#0" expanded="false" />
-            <element signature="e#57568#57688#0" expanded="false" />
-            <element signature="e#57738#57889#0" expanded="false" />
-            <element signature="e#57942#65696#0" expanded="false" />
-            <element signature="e#65745#65784#0" expanded="false" />
-            <element signature="e#65833#66623#0" expanded="false" />
-            <element signature="e#66673#69473#0" expanded="false" />
-            <element signature="e#69518#70267#0" expanded="false" />
-            <element signature="e#70315#71811#0" expanded="false" />
-            <element signature="e#71856#72729#0" expanded="false" />
-            <element signature="e#79045#80829#0" expanded="false" />
-            <element signature="e#80879#80975#0" expanded="false" />
-            <element signature="e#81038#81565#0" expanded="false" />
-            <element signature="e#81636#86924#0" expanded="false" />
-            <element signature="e#86968#87025#0" expanded="false" />
-            <element signature="e#87079#90428#0" expanded="false" />
-            <element signature="e#90483#92414#0" expanded="false" />
-            <element signature="e#92480#93100#0" expanded="false" />
-            <element signature="e#93143#94041#0" expanded="false" />
-            <element signature="e#94077#94866#0" expanded="false" />
-            <element signature="e#94908#95003#0" expanded="false" />
-            <element signature="e#95053#95201#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -768,28 +711,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1458" max-vertical-offset="6154">
           <caret line="128" column="38" selection-start-line="128" selection-start-column="38" selection-end-line="128" selection-end-column="38" />
-          <folding>
-            <element signature="e#1861#2039#0" expanded="false" />
-            <element signature="e#2069#2247#0" expanded="false" />
-            <element signature="e#2278#2289#0" expanded="false" />
-            <element signature="e#2333#2350#0" expanded="false" />
-            <element signature="e#2403#2495#0" expanded="false" />
-            <element signature="e#2570#2841#0" expanded="false" />
-            <element signature="e#3603#5700#0" expanded="false" />
-            <element signature="e#5731#6122#0" expanded="false" />
-            <element signature="e#6161#6832#0" expanded="false" />
-            <element signature="e#6864#9288#0" expanded="false" />
-            <element signature="e#10674#12765#0" expanded="false" />
-            <element signature="e#12808#12915#0" expanded="false" />
-            <element signature="e#12958#13041#0" expanded="false" />
-            <element signature="e#13083#13190#0" expanded="false" />
-            <element signature="e#13233#13340#0" expanded="false" />
-            <element signature="e#13411#13544#0" expanded="false" />
-            <element signature="e#15816#16288#0" expanded="false" />
-            <element signature="e#16323#16418#0" expanded="false" />
-            <element signature="e#16459#16787#0" expanded="false" />
-            <element signature="e#16820#17487#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -827,48 +748,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="25024" max-vertical-offset="26979">
           <caret line="1472" column="26" selection-start-line="1472" selection-start-column="26" selection-end-line="1472" selection-end-column="26" />
-          <folding>
-            <element signature="e#24#781#1" expanded="false" />
-            <element signature="e#2318#2615#0" expanded="false" />
-            <element signature="e#2652#7286#0" expanded="false" />
-            <element signature="e#7325#19290#0" expanded="false" />
-            <element signature="e#19331#20097#0" expanded="false" />
-            <element signature="e#20148#27163#0" expanded="false" />
-            <element signature="e#27207#30636#0" expanded="false" />
-            <element signature="e#30677#31904#0" expanded="false" />
-            <element signature="e#32004#36358#0" expanded="false" />
-            <element signature="e#36406#38470#0" expanded="false" />
-            <element signature="e#38512#39500#0" expanded="false" />
-            <element signature="e#39550#44164#0" expanded="false" />
-            <element signature="e#44229#50582#0" expanded="false" />
-            <element signature="e#50630#51365#0" expanded="false" />
-            <element signature="e#51429#53484#0" expanded="false" />
-            <element signature="e#53533#55492#0" expanded="false" />
-            <element signature="e#55649#56901#0" expanded="false" />
-            <element signature="e#56957#57374#0" expanded="false" />
-            <element signature="e#57416#57525#0" expanded="false" />
-            <element signature="e#57568#57688#0" expanded="false" />
-            <element signature="e#57738#57889#0" expanded="false" />
-            <element signature="e#57942#65696#0" expanded="false" />
-            <element signature="e#65745#65784#0" expanded="false" />
-            <element signature="e#65833#66623#0" expanded="false" />
-            <element signature="e#66673#69473#0" expanded="false" />
-            <element signature="e#69518#70267#0" expanded="false" />
-            <element signature="e#70315#71811#0" expanded="false" />
-            <element signature="e#71856#72729#0" expanded="false" />
-            <element signature="e#79045#80829#0" expanded="false" />
-            <element signature="e#80879#80975#0" expanded="false" />
-            <element signature="e#81038#81565#0" expanded="false" />
-            <element signature="e#81636#86924#0" expanded="false" />
-            <element signature="e#86968#87025#0" expanded="false" />
-            <element signature="e#87079#90428#0" expanded="false" />
-            <element signature="e#90483#92414#0" expanded="false" />
-            <element signature="e#92480#93100#0" expanded="false" />
-            <element signature="e#93143#94041#0" expanded="false" />
-            <element signature="e#94077#94866#0" expanded="false" />
-            <element signature="e#94908#95003#0" expanded="false" />
-            <element signature="e#95053#95201#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -947,14 +827,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33277312" vertical-offset="329" max-vertical-offset="86666">
           <caret line="31" column="11" selection-start-line="31" selection-start-column="11" selection-end-line="31" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="17595" max-vertical-offset="22797">
-          <caret line="1035" column="20" selection-start-line="1035" selection-start-column="20" selection-end-line="1035" selection-end-column="20" />
         </state>
       </provider>
     </entry>
@@ -1055,7 +927,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="814" max-vertical-offset="1649">
           <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1063,7 +934,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="561">
           <caret line="27" column="40" selection-start-line="27" selection-start-column="40" selection-end-line="27" selection-end-column="61" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1071,7 +941,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="3443" max-vertical-offset="11322">
           <caret line="218" column="16" selection-start-line="218" selection-start-column="16" selection-end-line="218" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1079,7 +948,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7555297" vertical-offset="660" max-vertical-offset="1564">
           <caret line="81" column="34" selection-start-line="81" selection-start-column="34" selection-end-line="81" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1087,133 +955,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="4097">
           <caret line="290" column="26" selection-start-line="290" selection-start-column="26" selection-end-line="290" selection-end-column="26" />
-          <folding>
-            <element signature="e#1026#1712#0" expanded="false" />
-            <element signature="e#1746#1985#0" expanded="false" />
-            <element signature="e#2009#2168#0" expanded="false" />
-            <element signature="e#2469#2610#0" expanded="false" />
-            <element signature="e#2637#2719#0" expanded="false" />
-            <element signature="e#2756#3275#0" expanded="false" />
-            <element signature="e#3299#3565#0" expanded="false" />
-            <element signature="e#3590#4136#0" expanded="false" />
-            <element signature="e#4175#4486#0" expanded="false" />
-            <element signature="e#4512#4608#0" expanded="false" />
-            <element signature="e#4655#4786#0" expanded="false" />
-            <element signature="e#4808#5047#0" expanded="false" />
-            <element signature="e#5070#5109#0" expanded="false" />
-            <element signature="e#5142#6106#0" expanded="false" />
-            <element signature="e#6151#6381#0" expanded="false" />
-            <element signature="e#6414#6999#0" expanded="false" />
-            <element signature="e#7028#7105#0" expanded="false" />
-            <element signature="e#7143#7200#0" expanded="false" />
-            <element signature="e#7228#7590#0" expanded="false" />
-            <element signature="e#7629#8179#0" expanded="false" />
-            <element signature="e#9677#9773#0" expanded="false" />
-            <element signature="e#9803#10347#0" expanded="false" />
-            <element signature="e#10393#11649#0" expanded="false" />
-            <element signature="e#11673#12466#0" expanded="false" />
-            <element signature="e#12505#13776#0" expanded="false" />
-            <element signature="e#13828#15214#0" expanded="false" />
-            <element signature="e#15266#15342#0" expanded="false" />
-            <element signature="e#15362#15470#0" expanded="false" />
-            <element signature="e#15499#16861#0" expanded="false" />
-            <element signature="e#16909#17867#0" expanded="false" />
-            <element signature="e#17893#18927#0" expanded="false" />
-            <element signature="e#18956#19011#0" expanded="false" />
-            <element signature="e#19040#19174#0" expanded="false" />
-            <element signature="e#19202#19417#0" expanded="false" />
-            <element signature="e#19455#19822#0" expanded="false" />
-            <element signature="e#19858#20733#0" expanded="false" />
-            <element signature="e#20800#21311#0" expanded="false" />
-            <element signature="e#21336#24918#0" expanded="false" />
-            <element signature="e#21392#22042#0" expanded="false" />
-            <element signature="e#22079#23076#0" expanded="false" />
-            <element signature="e#23107#24131#0" expanded="false" />
-            <element signature="e#24170#24918#0" expanded="false" />
-            <element signature="e#24945#25422#0" expanded="false" />
-            <element signature="e#25456#27122#0" expanded="false" />
-            <element signature="e#27146#28682#0" expanded="false" />
-            <element signature="e#27174#27341#0" expanded="false" />
-            <element signature="e#27391#28130#0" expanded="false" />
-            <element signature="e#28165#28451#0" expanded="false" />
-            <element signature="e#28484#28682#0" expanded="false" />
-            <element signature="e#28702#30850#0" expanded="false" />
-            <element signature="e#28743#29158#0" expanded="false" />
-            <element signature="e#29192#29750#0" expanded="false" />
-            <element signature="e#29788#29974#0" expanded="false" />
-            <element signature="e#30007#30267#0" expanded="false" />
-            <element signature="e#30301#30487#0" expanded="false" />
-            <element signature="e#30528#30667#0" expanded="false" />
-            <element signature="e#30701#30778#0" expanded="false" />
-            <element signature="e#30810#30850#0" expanded="false" />
-            <element signature="e#30874#35462#0" expanded="false" />
-            <element signature="e#30915#30971#0" expanded="false" />
-            <element signature="e#31004#31194#0" expanded="false" />
-            <element signature="e#31228#31414#0" expanded="false" />
-            <element signature="e#31462#31762#0" expanded="false" />
-            <element signature="e#31821#32215#0" expanded="false" />
-            <element signature="e#32276#32772#0" expanded="false" />
-            <element signature="e#32806#33080#0" expanded="false" />
-            <element signature="e#33126#33283#0" expanded="false" />
-            <element signature="e#33321#33348#0" expanded="false" />
-            <element signature="e#33388#33415#0" expanded="false" />
-            <element signature="e#33456#33598#0" expanded="false" />
-            <element signature="e#33629#33751#0" expanded="false" />
-            <element signature="e#33785#35390#0" expanded="false" />
-            <element signature="e#35422#35462#0" expanded="false" />
-            <element signature="e#35487#36784#0" expanded="false" />
-            <element signature="e#35515#35519#0" expanded="false" />
-            <element signature="e#35568#35625#0" expanded="false" />
-            <element signature="e#35685#35746#0" expanded="false" />
-            <element signature="e#35776#36065#0" expanded="false" />
-            <element signature="e#36108#36325#0" expanded="false" />
-            <element signature="e#36364#36548#0" expanded="false" />
-            <element signature="e#36584#36784#0" expanded="false" />
-            <element signature="e#36811#40878#0" expanded="false" />
-            <element signature="e#36839#36843#0" expanded="false" />
-            <element signature="e#36910#39545#0" expanded="false" />
-            <element signature="e#39594#39651#0" expanded="false" />
-            <element signature="e#39711#39772#0" expanded="false" />
-            <element signature="e#39802#40092#0" expanded="false" />
-            <element signature="e#40121#40232#0" expanded="false" />
-            <element signature="e#40271#40476#0" expanded="false" />
-            <element signature="e#40515#40701#0" expanded="false" />
-            <element signature="e#40737#40878#0" expanded="false" />
-            <element signature="e#40902#46622#0" expanded="false" />
-            <element signature="e#40930#41405#0" expanded="false" />
-            <element signature="e#41439#41997#0" expanded="false" />
-            <element signature="e#42031#42284#0" expanded="false" />
-            <element signature="e#42329#44204#0" expanded="false" />
-            <element signature="e#44238#45729#0" expanded="false" />
-            <element signature="e#45773#46145#0" expanded="false" />
-            <element signature="e#46182#46381#0" expanded="false" />
-            <element signature="e#46412#46439#0" expanded="false" />
-            <element signature="e#46473#46550#0" expanded="false" />
-            <element signature="e#46582#46622#0" expanded="false" />
-            <element signature="e#46654#47325#0" expanded="false" />
-            <element signature="e#47366#47966#0" expanded="false" />
-            <element signature="e#47999#48243#0" expanded="false" />
-            <element signature="e#48276#48492#0" expanded="false" />
-            <element signature="e#48528#48638#0" expanded="false" />
-            <element signature="e#48680#49061#0" expanded="false" />
-            <element signature="e#49104#49678#0" expanded="false" />
-            <element signature="e#49731#51182#0" expanded="false" />
-            <element signature="e#51206#55799#0" expanded="false" />
-            <element signature="e#51248#51305#0" expanded="false" />
-            <element signature="e#51338#51591#0" expanded="false" />
-            <element signature="e#51627#51894#0" expanded="false" />
-            <element signature="e#51942#52210#0" expanded="false" />
-            <element signature="e#52253#52450#0" expanded="false" />
-            <element signature="e#52535#53037#0" expanded="false" />
-            <element signature="e#53085#53405#0" expanded="false" />
-            <element signature="e#53461#53633#0" expanded="false" />
-            <element signature="e#53674#53823#0" expanded="false" />
-            <element signature="e#53854#53966#0" expanded="false" />
-            <element signature="e#54000#55727#0" expanded="false" />
-            <element signature="e#55759#55799#0" expanded="false" />
-            <element signature="e#55835#55992#0" expanded="false" />
-            <element signature="e#56029#56167#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1221,28 +962,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4371921" vertical-offset="1481" max-vertical-offset="3094">
           <caret line="246" column="36" selection-start-line="246" selection-start-column="36" selection-end-line="246" selection-end-column="36" />
-          <folding>
-            <element signature="e#1861#2039#0" expanded="false" />
-            <element signature="e#2069#2247#0" expanded="false" />
-            <element signature="e#2278#2289#0" expanded="false" />
-            <element signature="e#2333#2350#0" expanded="false" />
-            <element signature="e#2403#2495#0" expanded="false" />
-            <element signature="e#2570#2841#0" expanded="false" />
-            <element signature="e#3603#5700#0" expanded="false" />
-            <element signature="e#5731#6122#0" expanded="false" />
-            <element signature="e#6161#6832#0" expanded="false" />
-            <element signature="e#6864#9288#0" expanded="false" />
-            <element signature="e#10674#12765#0" expanded="false" />
-            <element signature="e#12808#12915#0" expanded="false" />
-            <element signature="e#12958#13041#0" expanded="false" />
-            <element signature="e#13083#13190#0" expanded="false" />
-            <element signature="e#13233#13340#0" expanded="false" />
-            <element signature="e#13411#13544#0" expanded="false" />
-            <element signature="e#15816#16288#0" expanded="false" />
-            <element signature="e#16323#16418#0" expanded="false" />
-            <element signature="e#16459#16787#0" expanded="false" />
-            <element signature="e#16820#17487#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1256,61 +975,12 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Localization.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="62.07143" vertical-offset="3234" max-vertical-offset="4046">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3234" max-vertical-offset="4046">
           <caret line="88" column="23" selection-start-line="88" selection-start-column="23" selection-end-line="88" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Core.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.071429" vertical-offset="2754" max-vertical-offset="4012">
-          <caret line="1401" column="47" selection-start-line="1401" selection-start-column="47" selection-end-line="1401" selection-end-column="47" />
-          <folding>
-            <element signature="e#24#781#1" expanded="false" />
-            <element signature="e#2318#2615#0" expanded="false" />
-            <element signature="e#2652#7286#0" expanded="false" />
-            <element signature="e#7325#19290#0" expanded="false" />
-            <element signature="e#19331#20097#0" expanded="false" />
-            <element signature="e#20148#27163#0" expanded="false" />
-            <element signature="e#27207#30636#0" expanded="false" />
-            <element signature="e#30677#31904#0" expanded="false" />
-            <element signature="e#32004#36358#0" expanded="false" />
-            <element signature="e#36406#38470#0" expanded="false" />
-            <element signature="e#38512#39500#0" expanded="false" />
-            <element signature="e#39550#44164#0" expanded="false" />
-            <element signature="e#44229#50582#0" expanded="false" />
-            <element signature="e#50630#51365#0" expanded="false" />
-            <element signature="e#51429#53484#0" expanded="false" />
-            <element signature="e#53533#55492#0" expanded="false" />
-            <element signature="e#55649#56901#0" expanded="false" />
-            <element signature="e#56957#57374#0" expanded="false" />
-            <element signature="e#57416#57525#0" expanded="false" />
-            <element signature="e#57568#57688#0" expanded="false" />
-            <element signature="e#57738#57889#0" expanded="false" />
-            <element signature="e#57942#65696#0" expanded="false" />
-            <element signature="e#65745#65784#0" expanded="false" />
-            <element signature="e#65833#66623#0" expanded="false" />
-            <element signature="e#66673#69473#0" expanded="false" />
-            <element signature="e#69518#70267#0" expanded="false" />
-            <element signature="e#70315#71811#0" expanded="false" />
-            <element signature="e#71856#72729#0" expanded="false" />
-            <element signature="e#79045#80829#0" expanded="false" />
-            <element signature="e#80879#80975#0" expanded="false" />
-            <element signature="e#81038#81565#0" expanded="false" />
-            <element signature="e#81636#86924#0" expanded="false" />
-            <element signature="e#86968#87025#0" expanded="false" />
-            <element signature="e#87079#90428#0" expanded="false" />
-            <element signature="e#90483#92414#0" expanded="false" />
-            <element signature="e#92480#93100#0" expanded="false" />
-            <element signature="e#93143#94041#0" expanded="false" />
-            <element signature="e#94077#94866#0" expanded="false" />
-            <element signature="e#94908#95003#0" expanded="false" />
-            <element signature="e#95053#95201#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Downloader.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="187" max-vertical-offset="2278">
@@ -1319,14 +989,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/addon.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/SearcherABC.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="102" max-vertical-offset="1547">
@@ -1337,20 +999,44 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/AceStream.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.45899633" vertical-offset="1274" max-vertical-offset="2448">
-          <caret line="110" column="25" selection-start-line="110" selection-start-column="25" selection-end-line="110" selection-end-column="25" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1154" max-vertical-offset="2448">
+          <caret line="120" column="46" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/addon.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510">
+          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Libtorrent.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44047618" vertical-offset="1228" max-vertical-offset="7310">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1598" max-vertical-offset="7310">
           <caret line="108" column="43" selection-start-line="108" selection-start-column="43" selection-end-line="108" selection-end-column="43" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/resources/utorrent/net.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6051661" vertical-offset="14536" max-vertical-offset="22576">
+          <caret line="900" column="16" selection-start-line="900" selection-start-column="8" selection-end-line="900" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Core.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56962025" vertical-offset="26648" max-vertical-offset="29903">
+          <caret line="1608" column="46" selection-start-line="1608" selection-start-column="46" selection-end-line="1608" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 
diff --git a/addon.xml b/addon.xml
index 97e700d..b9b2b17 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.torrenter" name="Torrenter" version="2.1.4" provider-name="vadim.skorba, DiMartino">
+<addon id="plugin.video.torrenter" name="Torrenter" version="2.1.5" provider-name="vadim.skorba, DiMartino">
     <requires>
         <import addon="xbmc.python" version="2.1.0"/>
         <import addon="script.module.libtorrent"/>
diff --git a/resources/utorrent/net.py b/resources/utorrent/net.py
index 24f8724..b2a58b0 100644
--- a/resources/utorrent/net.py
+++ b/resources/utorrent/net.py
@@ -903,7 +903,10 @@ class Deluge:
         if obj is None:
             return False
 
-        res = [obj['result'].get('download_location')]
+        try:
+            res = [obj['result'].get('download_location')]
+        except:
+            res=[None]
         return res, res
 
     def listfiles(self, id):