diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..32a8229
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: rust
+cache: cargo
+rust:
+  - stable
+  - beta
+  - nightly
+ 
diff --git a/README.md b/README.md
index 738cbaa..9cd0e1f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.com/danijoo/WHAM.svg?branch=master)](https://travis-ci.com/danijoo/WHAM)
+
 Weighted Histogram Analysis Method (WHAM)
 ===
 This is an fast implementation of the weighted histogram analysis method
@@ -23,6 +25,8 @@ TODO
 - Multithreading (?)
 - Error analysis / bootstrapping
 - Better error messages during file I/O
+- Autocorrelation
+- Replica exchange
 
 License 
 ---