fix travis-ci
Merge branch 'master' of https://github.com/neubt/ershou