fix travisCI
Merge branch 'design'