Merge branch 'newer'
updated with more info
merge strategies #1
Merge branch 'master' into newer
updated ehre