Mid-term changes i introduction
Merge branch 'robin'