Update documentation
Merge branch 'master' into fix/api-update

Conflicts:
	README.md