diff --git a/.travis.yml b/.travis.yml
index 864075b..c0659c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,13 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
 
 install:
   - pip install nose
   - pip install .
 
-script: 
+script:
     - pwd
     - nosetests -v --exe
diff --git a/AUTHORS b/AUTHORS
index e8cf2db..813404b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,8 +8,9 @@ Contributors
 Aldo Hoeben <aldo@fieldofview.com>
 Rio Kierkels <riokierkels@gmail.com>
 Pieter Hintjens <ph@imatix.com>
-HKU MAPLAB <http://www.maplab.nl
+HKU MAPLAB <http://www.maplab.nl>
 Steven Silvester <steven.silvester@ieee.org>
+Pablo Prietz <pablo@prietz.org>
 
 Corporate Contributors
 ======================