Merge branch 'master' into sara

Fixed conflicts