Merged Travis's and my changes