Adding "Smet new"
Merge branch 'master' into Smet-branch
Merge Smet-branch