Merge Travis' and my changes