Changed to aliases I actually use
Added Matlab/Octave support