Updated to work with changes in unstable version of Octave 2.1.36.
Tested with 2.0.17 (ok) but will break earlier unstables (2.1.(<=35)).