Fixed the matlab/octave stuff