updated readme
Merge branch 'master' into version1.2beta