Updated for Travis CI