Update README.md
Updated readme to change some confusing parts
Merge branch 'master' into 1.0