Merge branch 'gold2'

Conflicts:
	README.md