Merge branch 'matlab'

Conflicts:
	README.md