Upgraded wrapper for Travis CI