Some small changes
Merge branch 'master' into marc