Merge remote-tracking branch 'elia/readme-fix'

Conflicts:
	README.md