Updated with travis build