Merge branch 'AgeMixing'
minor changes
Merge branch 'master' into AgeMixing