Merge origin/LocalMathieuMac

Conflicts:
	README.md