Some changes
Merge branch 'thomas'