Duplicating initial matlab behavior to octave. Closes #3