added basic support for composite

Conflicts:
	README.md