Rebasing work on travis file