update README
Merge branches 'master' and 'wip' into wip
Merge branches 'master' and 'wip'