9.2 work

Fixed travis.yaml

Refactored
Merge pull request #8 from roaet/9.2

9.2 work