Merge origin/randar

Conflicts:
	README.md