readme edit
readme edit
Merge branch 'master' into mac