Updated names
added travis support