Added octave control (resolves #5)