Fixed settings
Fixed travis-ci