diff --git a/.travis.yml b/.travis.yml
index bc8fa91..e927024 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ dist: trusty
 language: python
 python:
   - "2.7"
-  #- "3.3"
-  #- "3.4"
+  - "3.3"
+  - "3.4"
   - "3.5"
 
 cache:
diff --git a/release.bash b/release.bash
index fbdf97b..bd8e9b9 100755
--- a/release.bash
+++ b/release.bash
@@ -20,6 +20,7 @@ usage="
         --py2                  - use python 2
         --py3                  - use python 3 (default)
         --reuse-venv           - do not remove virtual environment, and reusse it on next call
+        --no-docs              - do not generate and upload docs
 
 "
 
@@ -45,6 +46,9 @@ do
         --py3)
             USE_PY_VERSION='python3';
         ;;
+        --no-docs)
+            NO_DOCS=1;
+        ;;
         --reuse-venv)
             REUSE_VENV=1;
         ;;
@@ -102,9 +106,8 @@ function release_implementation {
     # Build [and upload to pypi] project
     python $SCRIPTPATH/setup.py $setup_options;
 
-    build_docs;
-
-    if [ -z $DRY_RUN ] && [ -z $TEST_PYPI_INDEX ]; then
+    if [ -z $DRY_RUN ] && [ -z $TEST_PYPI_INDEX ] && [ -z $NO_DOCS ]; then
+        build_docs;
         python setup.py upload_docs;
     fi
 }
diff --git a/setup.py b/setup.py
index 3d35caf..0c50aaf 100644
--- a/setup.py
+++ b/setup.py
@@ -53,8 +53,8 @@
           'Topic :: Software Development :: Libraries',
           'Topic :: Software Development :: Libraries :: Python Modules',
       ],
-      keywords=['openerp', 'odoo', 'odoo-rpc', 'rpc', 'xmlrpc',
-                'xml-rpc', 'json-rpc', 'jsonrpc', 'odoo-client', 'ipython'],
+      keywords=['odoo', 'odoo-rpc', 'rpc', 'xmlrpc',
+                'xml-rpc', 'json-rpc', 'jsonrpc', 'odoo-client', 'openerp'],
       extras_require={
           'all': ['anyfield'],
       },