diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..c1b71d70f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+language: python
+
+python:
+  - 2.6
+  - 2.7
+
+before_install:
+  - git submodule update --init --recursive
+  - cd kafka-src
+  - ./sbt update
+  - ./sbt package
+  - cd -
+
+install:
+  pip install .
+
+script:
+  - python -m test.test_unit
+  - python -m test.test_integration
diff --git a/README.md b/README.md
index a3bb8f63f..01a241ceb 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Kafka Python client
 
+![travis](https://travis-ci.org/mumrah/kafka-python.png)
+
 This module provides low-level protocol support for Apache Kafka as well as
 high-level consumer and producer classes. Request batching is supported by the
 protocol as well as broker-aware request routing. Gzip and Snappy compression
@@ -15,7 +17,7 @@ Copyright 2013, David Arthur under Apache License, v2.0. See `LICENSE`
 
 # Status
 
-I'm following the version numbers of Kafka, plus one number to indicate the 
+I'm following the version numbers of Kafka, plus one number to indicate the
 version of this project. The current version is 0.8.1-1. This version is under
 development, APIs are subject to change.
 
diff --git a/kafka/util.py b/kafka/util.py
index c153d629c..259e2854e 100644
--- a/kafka/util.py
+++ b/kafka/util.py
@@ -3,7 +3,7 @@
 import struct
 from threading import Thread, Event
 
-from common import BufferUnderflowError
+from common import *
 
 
 def write_int_string(s):