pull 5
Merge pull request #4 from zhaol/travis

---