9.2 work

Fixed travis.yaml

Refactored