diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..097781a4d4903027e5ec16ae9cc84e906531033a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,41 @@
+language: cpp
+
+os:
+  - linux
+  - osx
+
+compiler:
+  - gcc
+  - clang
+
+env:
+  - BUILD_TYPE=Debug
+  - BUILD_TYPE=Release
+
+matrix:
+  exclude:
+    - os: osx
+      compiler: gcc
+
+install:
+  # Install dependencies for FCL
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then 'ci/install_linux.sh' ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx"   ]; then 'ci/install_osx.sh'   ; fi
+
+script:
+  # Create build directory
+  - mkdir build
+  - cd build 
+
+  # Configure
+  - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
+
+  # Build
+  - make -j4
+
+  # Run unit tests
+  - make test
+
+  # Make sure we can install with no issues
+  - sudo make -j4 install
+
diff --git a/README.md b/README.md
index 43aba71e6cbf7a889e09eb4e5de1c41ec1c4f634..492826f73d5d742f71eb339b57f21b5db0fd1f0a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-## FCL -- The Flexible Collision Library
-
+## FCL -- The Flexible Collision Library [![Build Status](https://travis-ci.org/flexible-collision-library/fcl.svg)](https://travis-ci.org/flexible-collision-library/fcl)
 
 FCL is a library for performing three types of proximity queries on a pair of geometric models composed of triangles. 
  - Collision detection: detecting whether the two models overlap, and optionally, all of the triangles that overlap.
diff --git a/ci/install_linux.sh b/ci/install_linux.sh
new file mode 100755
index 0000000000000000000000000000000000000000..854587007288a350b1b8c719693383a11ad1bce4
--- /dev/null
+++ b/ci/install_linux.sh
@@ -0,0 +1,24 @@
+sudo add-apt-repository --yes ppa:libccd-debs/ppa
+sudo apt-get -qq update
+
+########################
+# Mendatory dependencies
+########################
+sudo apt-get -qq --yes --force-yes install cmake
+sudo apt-get -qq --yes --force-yes install libboost-all-dev
+sudo apt-get -qq --yes --force-yes install libccd-dev
+
+########################
+# Optional dependencies
+########################
+sudo apt-get -qq --yes --force-yes install libflann-dev
+
+# Octomap
+git clone https://github.com/OctoMap/octomap
+cd octomap
+git checkout tags/v1.6.8
+mkdir build
+cd build
+cmake ..
+make
+sudo make install
diff --git a/ci/install_osx.sh b/ci/install_osx.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1b1a6107076f87c7ad271f65fee59056c1d55ccd
--- /dev/null
+++ b/ci/install_osx.sh
@@ -0,0 +1,6 @@
+brew tap homebrew/science
+
+brew install git
+brew install cmake
+brew install boost
+brew install libccd