Merged with test.

Conflicts:
	README.md