commiting matlab stuff
fixed merge