fix travisci
Merge branch 'fixtravisci'