And added the missing pieces to make Travis CI works