Update branch
Added travis configuration