pull 6
Merge pull request #5 from zhaol/travis

---