added octave mode support