Modified to work a little better with Jenkins (hopefully)