diff --git a/.idea/cakecms-python-api.iml b/.idea/cakecms-python-api.iml
index 4378dc6..4c305b3 100644
--- a/.idea/cakecms-python-api.iml
+++ b/.idea/cakecms-python-api.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 2.7.11 (C:\tools\python2\python.exe)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.6" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index df2c7a2..904ef0d 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -4,9 +4,12 @@
     <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ourVersions">
         <value>
-          <list size="2">
-            <item index="0" class="java.lang.String" itemvalue="2.7" />
-            <item index="1" class="java.lang.String" itemvalue="3.5" />
+          <list size="5">
+            <item index="0" class="java.lang.String" itemvalue="3.5" />
+            <item index="1" class="java.lang.String" itemvalue="3.6" />
+            <item index="2" class="java.lang.String" itemvalue="3.7" />
+            <item index="3" class="java.lang.String" itemvalue="3.8" />
+            <item index="4" class="java.lang.String" itemvalue="3.9" />
           </list>
         </value>
       </option>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d33d5e8..b524304 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.11 (C:\tools\python2\python.exe)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
 </project>
\ No newline at end of file
diff --git a/cakecms/__init__.py b/cakecms/__init__.py
index a8a2126..25f1085 100644
--- a/cakecms/__init__.py
+++ b/cakecms/__init__.py
@@ -1 +1 @@
-from cakecms import CakeCMS
+from .cakecms import CakeCMS
diff --git a/cakecms/cakecms.py b/cakecms/cakecms.py
index b30c8d1..185bdd2 100644
--- a/cakecms/cakecms.py
+++ b/cakecms/cakecms.py
@@ -1,14 +1,14 @@
 from __future__ import unicode_literals
 from __future__ import print_function
 import requests
-import urllib
+import urllib.parse
 import json
 import collections
 import datetime
 
 
 def quote_named_param(p):
-	return urllib.quote(str(p)).replace('/', '%2f')
+	return urllib.parse.quote(str(p)).replace('/', '%2f')
 
 
 def json_decode_ordered(txt):