Update README.md

rewrite README after the merges to master.