Update README.md
A bunch of changes
Merge branch 'master' into gh-pages
Update example
Fix merge conflict