Updated to work with travis cl