Update beta branch
Merge branch 'beta'

Conflicts:
	README.md