pull 2
Merge pull request #2 from zhaol/travis

---
make sure merging pull request into master