diff --git a/AUTHORS.txt b/AUTHORS.txt
index 21b31904..0bbe5b5b 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -21,5 +21,6 @@ Lubos Trilety <ltrilety@redhat.com>
 Akinori Hattori (@hattya)
 srusskih (@srusskih)
 Steven Silvester (@blink1073)
+Colin Duquesnoy (@ColinDuquesnoy) <colin.duquesnoy@gmail.com>
 
 Note: (@user) means a github user name.
diff --git a/README.rst b/README.rst
index c6bd4774..d0f12c3e 100644
--- a/README.rst
+++ b/README.rst
@@ -34,7 +34,7 @@ me.
 Jedi can be used with the following editors:
 
 - Vim (jedi-vim_, YouCompleteMe_)
-- Emacs (Jedi.el_)
+- Emacs (Jedi.el_, company-jedi_)
 - Sublime Text (SublimeJEDI_ [ST2 + ST3], anaconda_ [only ST3])
 - SynWrite_
 
@@ -137,6 +137,7 @@ For more detailed information visit the `testing documentation
 .. _jedi-vim: https://github.com/davidhalter/jedi-vim
 .. _youcompleteme: http://valloric.github.io/YouCompleteMe/
 .. _Jedi.el: https://github.com/tkf/emacs-jedi
+.. _company-jedi: https://github.com/proofit404/company-jedi
 .. _sublimejedi: https://github.com/srusskih/SublimeJEDI
 .. _anaconda: https://github.com/DamnWidget/anaconda
 .. _SynWrite: http://uvviewsoft.com/synjedi/
diff --git a/docs/docs/usage.rst b/docs/docs/usage.rst
index ca5ddbe8..f6f53f6b 100644
--- a/docs/docs/usage.rst
+++ b/docs/docs/usage.rst
@@ -19,21 +19,22 @@ Editor Plugins
 
 Vim:
 
-- `jedi-vim <http://github.com/davidhalter/jedi-vim>`_
-- `YouCompleteMe <http://valloric.github.io/YouCompleteMe/>`_
+- jedi-vim_
+- YouCompleteMe_
 
 Emacs:
 
-- `Jedi.el <https://github.com/tkf/emacs-jedi>`_
+- Jedi.el_
+- company-jedi_
 
 Sublime Text 2/3:
 
-- `SublimeJEDI <https://github.com/srusskih/SublimeJEDI>`_  (ST2 & ST3)
-- `anaconda <https://github.com/DamnWidget/anaconda>`_ (only ST3)
+- SublimeJEDI_ (ST2 & ST3)
+- anaconda_ (only ST3)
 
 SynWrite:
 
-- `SynJedi <http://uvviewsoft.com/synjedi/>`_
+- SynJedi_
 
 
 .. _other-software:
@@ -62,3 +63,12 @@ Using a custom ``$HOME/.pythonrc.py``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. autofunction:: jedi.utils.setup_readline
+
+.. _jedi-vim: https://github.com/davidhalter/jedi-vim
+.. _youcompleteme: http://valloric.github.io/YouCompleteMe/
+.. _Jedi.el: https://github.com/tkf/emacs-jedi
+.. _company-jedi: https://github.com/proofit404/company-jedi
+.. _sublimejedi: https://github.com/srusskih/SublimeJEDI
+.. _anaconda: https://github.com/DamnWidget/anaconda
+.. _SynJedi: http://uvviewsoft.com/synjedi/
+.. _wdb: https://github.com/Kozea/wdb
diff --git a/jedi/api.py b/jedi/api.py
index 387cbd01..938af649 100644
--- a/jedi/api.py
+++ b/jedi/api.py
@@ -5,6 +5,8 @@ use its methods.
 Additionally you can add a debug function with :func:`set_debug_function` and
 catch :exc:`NotFoundError` which is being raised if your completion is not
 possible.
+
+.. warning:: Please, note that Jedi is **not thread safe**.
 """
 from __future__ import with_statement