beta
Merge branch 'master' into prepared

Conflicts:
	README.md