diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c2bdbf0
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,130 @@
+sudo: required
+language: generic
+env:
+  global:
+    - WAF_JOBS=2
+
+matrix:
+  include:
+    # Linux/gcc
+    - os: linux
+      dist: trusty
+      env:
+        - CXX=g++-4.8
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources: ubuntu-toolchain-r-test
+          packages: g++-4.9
+      env:
+        - CXX=g++-4.9
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources: ubuntu-toolchain-r-test
+          packages: g++-5
+      env:
+        - CXX=g++-5
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources: ubuntu-toolchain-r-test
+          packages: g++-6
+      env:
+        - CXX=g++-6
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources: ubuntu-toolchain-r-test
+          packages: g++-7
+      env:
+        - CXX=g++-7
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+
+    # Linux/clang
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          packages: clang-3.5
+      env:
+        - CXX=clang++-3.5
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          packages: clang-3.6
+      env:
+        - CXX=clang++-3.6
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-precise-3.7
+            - ubuntu-toolchain-r-test
+          packages: clang-3.7
+      env:
+        - CXX=clang++-3.7
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-precise-3.8
+            - ubuntu-toolchain-r-test
+          packages: clang-3.8
+      env:
+        - CXX=clang++-3.8
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources: llvm-toolchain-trusty-3.9
+          packages: clang-3.9
+      env:
+        - CXX=clang++-3.9
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+    - os: linux
+      dist: trusty
+      addons:
+        apt:
+          sources: llvm-toolchain-trusty-4.0
+          packages: clang-4.0
+      env:
+        - CXX=clang++-4.0
+        - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+
+    # macOS/clang
+    # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
+    - os: osx
+      osx_image: xcode6.4
+      env:
+        - NODE_LABELS="OSX OSX-10.10"
+    - os: osx
+      osx_image: xcode7.3
+      env:
+        - NODE_LABELS="OSX OSX-10.11"
+    - os: osx
+      osx_image: xcode8.3
+      env:
+        - NODE_LABELS="OSX OSX-10.12"
+
+before_script:
+  - ${CXX:-c++} --version
+  - python --version
+
+script:
+  - ./.jenkins
diff --git a/README.md b/README.md
index 2a30b79..7a3f250 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-Traffic Generator For NDN (ndn-traffic-generator)
+Traffic Generator for NDN (ndn-traffic-generator)
 =================================================
 
+[![Build Status](https://travis-ci.org/named-data/ndn-traffic-generator.svg?branch=master)](https://travis-ci.org/named-data/ndn-traffic-generator)
+
 This tool is designed to generate Interest and Data traffic in an NDN network.
 The client and server tool accept traffic configuration files which can be
 used to specify the pattern of NDN traffic that is required to be generated.
@@ -20,12 +22,13 @@
 
 -----------------------------------------------------
 
-## 1. Compile & Installation Instructions: ##
+## 1. Compilation & Installation Instructions: ##
 
     ./waf configure
     ./waf
     sudo ./waf install
 
+
 ## 2. Tool Run Instructions & Command Line Options: ##
 
     Usage: ndn-traffic-server [options] <traffic_configuration_file>
@@ -51,17 +54,17 @@
 
 __ON MACHINE #1__
 
-(NDN forwarding daemon should be running)
+(NFD must be running)
 
-Start traffic server
+Start traffic server:
 
         ndn-traffic-server ndn-traffic-server.conf
 
 __ON MACHINE #2__
 
-(NDN forwarding daemon should be running)
+(NFD must be running)
 
-Start the traffic client
+Start the traffic client:
 
         ndn-traffic ndn-traffic-client.conf