Merge branch 'next'

Conflicts:
	README.md