update README
Merge branch 'master' into macbook
evil