Update README.md
Merge branch 'wip'
Merge remote-tracking branch 'upstream/master'