update README
Merge branch 'current'

Conflicts:
	README.md