more
Merge branch '7'

Conflicts:
	README.md