New files
Merge branch 'Travis'-branch'