add yaml file
update yaml file
Merge branch 'travis-ci' into develop
Merge branch 'develop'