travis-ci対応
Merge branch 'develop'