pull 3
Merge pull request #3 from zhaol/travis

---