Update README.md
Merge branch 'sibbo'
Fixed #1
Fix indentation in CMakeLists.txt
Skip building when matlab is not installed
Merge remote-tracking branch 'origin/fix_compilation_without_matlab' into test_no_matlab_merged

Conflicts:
	CMakeLists.txt