Updated for travis.ci