update README
Merge branch 'current'