Updated description in README file
Merge branch 'conflict-on-readme'

Conflicts:
	README.md

Decided to combine the text in both conflict-on-readme branch and master.