Merge branch 'stashbranch1'

Conflicts:
	README.md