Merge branch 'roc'

Conflicts:
	README.md