fix travis
Merge branch 'fix-travis-yml' into develop
Merge pull request #6 from yukiyan/develop

Develop