modify test
modify .travis.yml
Merge branch 'master' into test
Merge pull request #16 from cpyou/test

modify test