Travis test
Added macos
travis update
Merge branch 'travis'