Cleaned up MATLAB bit
Merge branch 'master' into MATLAB