1
Merge pull request #1 from zhaol/travis

---