updated readme
Merge branch 'master' into 1.7