diff --git a/.travis.yml b/.travis.yml
index 9f0315c..a767fd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,10 @@
 os:
   - linux
   - osx
-  
+
 go:
-  - 1.7.1
+  - 1.6.x
+  - 1.7.x
 
 sudo: false
 
diff --git a/AUTHORS b/AUTHORS
index f30c5ca..2d7bb2b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,6 @@
 Sergi Mansilla <sergi.mansilla@gmail.com>
 Shatrugna Sadhu <ssadhu@apcera.com>
 Shawn Smith <shawnpsmith@gmail.com>
+Stas Maksimov <maksimov@gmail.com>
 Tor Arvid Lund <torarvid@gmail.com>
 Zac Bergquist <zbergquist99@gmail.com>
-Stas Maksimov <maksimov@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 29f5607..369e3d5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -27,6 +27,6 @@
 Sergi Mansilla <sergi.mansilla@gmail.com>
 Shatrugna Sadhu <ssadhu@apcera.com>
 Shawn Smith <shawnpsmith@gmail.com>
+Stas Maksimov <maksimov@gmail.com>
 Tor Arvid Lund <torarvid@gmail.com>
 Zac Bergquist <zbergquist99@gmail.com>
-Stas Maksimov <maksimov@gmail.com>
\ No newline at end of file