fix travisci
Merge branch 'design'