add features2

Conflicts:
	README.md