Update the README & LICENSE.
Merge branch 'master' into change/readme

Conflicts:
	README.md