diff --git a/.gitignore b/.gitignore
index 783f07d7..d69b2262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ build/
 __pycache__/
 *egg-info/
 dist/
+.tox
 
 # Cosim
 *.o
diff --git a/Makefile b/Makefile
index ce777ea6..2f00ea29 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ install:
 localinstall:
 	python setup.py install --home=$(HOME)
 
+docs:
+	tox -e docs html
+
+livedocs:
+	tox -e docs livehtml
+
 release:
 	- rm MANIFEST 
 	- rm CHANGELOG.txt
diff --git a/doc/Makefile b/doc/Makefile
index 5a310c53..e776f544 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,6 +19,7 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html      to make standalone HTML files"
+	@echo "  livehtml  to make continuously updating standalone HTML files"
 	@echo "  web       to make files usable by Sphinx.web"
 	@echo "  htmlhelp  to make HTML files and a HTML help project"
 	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@@ -41,6 +42,10 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in build/html."
 
+livehtml:
+	mkdir -p build/html build/doctrees
+	sphinx-autobuild -b html $(ALLSPHINXOPTS) build/html
+
 web:
 	mkdir -p build/web build/doctrees
 	$(SPHINXBUILD) -b web $(ALLSPHINXOPTS) build/web
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..2f1dbc8c
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist = py27,py34
+
+[testenv]
+deps = pytest
+commands = py.test []
+
+[testenv:docs]
+whitelist_externals = make
+changedir = doc
+deps = sphinx-autobuild
+commands = make []