Merge / fix tour from master