Updated Matlab functions on master