#6 update from web.
Merge commit '398229d074ae02277ddb3e5434071853cca57e4d'

Conflicts:
	README.md