Merge branch 'master' into Ebby
minor changes
Merge branch 'Ebby'