Working on travis3
Merge branch 'travis3'