Merge branch 'test'

Conflicts:
	README.md