diff --git a/docs/Makefile b/docs/Makefile
index c7e2e63..63d4170 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -6,12 +6,18 @@ SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
+SPHINXINTL    = sphinx-intl
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
 $(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
 endif
 
+# User-friendly check for sphinx-intl
+ifeq ($(shell which $(SPHINXINTL) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXINTL)' command was not found. Make sure you have sphinx-intl installed, then set the SPHINXINTL environment variable to point to the full path of the '$(SPHINXINTL)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have sphinx-intl installed, grab it from https://pypi.python.org/pypi/sphinx-intl/)
+endif
+
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
@@ -22,30 +28,31 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 .PHONY: help
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  applehelp  to make an Apple Help Book"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+	@echo "  html         to make standalone HTML files"
+	@echo "  translations to make translated HTML files"
+	@echo "  dirhtml      to make HTML files named index.html in directories"
+	@echo "  singlehtml   to make a single large HTML file"
+	@echo "  pickle       to make pickle files"
+	@echo "  json         to make JSON files"
+	@echo "  htmlhelp     to make HTML files and a HTML help project"
+	@echo "  qthelp       to make HTML files and a qthelp project"
+	@echo "  applehelp    to make an Apple Help Book"
+	@echo "  devhelp      to make HTML files and a Devhelp project"
+	@echo "  epub         to make an epub"
+	@echo "  latex        to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf     to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja   to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text         to make text files"
+	@echo "  man          to make manual pages"
+	@echo "  texinfo      to make Texinfo files"
+	@echo "  info         to make Texinfo files and run them through makeinfo"
+	@echo "  gettext      to make PO message catalogs"
+	@echo "  changes      to make an overview of all changed/added/deprecated items"
+	@echo "  xml          to make Docutils-native XML files"
+	@echo "  pseudoxml    to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck    to check all external links for integrity"
+	@echo "  doctest      to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage     to run coverage check of the documentation (if enabled)"
 
 .PHONY: clean
 clean:
@@ -57,6 +64,13 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
+.PHONY: translations
+translations:
+	$(SPHINXINTL) build
+	$(SPHINXBUILD) -D language='es' -b html $(ALLSPHINXOPTS) $(BUILDDIR)/spanish
+	@echo
+	@echo "Build finished. The translated HTML pages are in $(BUILDDIR)/html."
+
 .PHONY: dirhtml
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
diff --git a/docs/conf.py b/docs/conf.py
index 019c873..8bf6247 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -63,7 +63,7 @@ release = u'0.1'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'es'
+language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/docs/make.bat b/docs/make.bat
index 8685397..f027b01 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -5,6 +5,10 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
+if "%SPHINXINTL%" == "" (
+	set SPHINXINTL=sphinx-intl
+)
+
 set BUILDDIR=_build
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
 set I18NSPHINXOPTS=%SPHINXOPTS% .
@@ -18,26 +22,27 @@ if "%1" == "" goto help
 if "%1" == "help" (
 	:help
 	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  xml        to make Docutils-native XML files
-	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	echo.  coverage   to run coverage check of the documentation if enabled
+	echo.  html         to make standalone HTML files
+	echo.  translations to make standalone HTML files
+	echo.  dirhtml      to make HTML files named index.html in directories
+	echo.  singlehtml   to make a single large HTML file
+	echo.  pickle       to make pickle files
+	echo.  json         to make JSON files
+	echo.  htmlhelp     to make HTML files and a HTML help project
+	echo.  qthelp       to make HTML files and a qthelp project
+	echo.  devhelp      to make HTML files and a Devhelp project
+	echo.  epub         to make an epub
+	echo.  latex        to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text         to make text files
+	echo.  man          to make manual pages
+	echo.  texinfo      to make Texinfo files
+	echo.  gettext      to make PO message catalogs
+	echo.  changes      to make an overview over all changed/added/deprecated items
+	echo.  xml          to make Docutils-native XML files
+	echo.  pseudoxml    to make pseudoxml-XML files for display purposes
+	echo.  linkcheck    to check all external links for integrity
+	echo.  doctest      to run all doctests embedded in the documentation if enabled
+	echo.  coverage     to run coverage check of the documentation if enabled
 	goto end
 )
 
@@ -80,6 +85,15 @@ if "%1" == "html" (
 	goto end
 )
 
+if "%1" == "translations" (
+	%SPHINXINTL% build
+	%SPHINXBUILD% -D language='es' -b html %ALLSPHINXOPTS% %BUILDDIR%/spanish
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The translated HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
 if "%1" == "dirhtml" (
 	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
 	if errorlevel 1 exit /b 1