pull 2
Merge pull request #2 from zhaol/travis

---