Improved doc
Merge: resolved differences

Conflicts:
	README.md