Updated to be compatible with travis ci