Conflicts from last commit fixed.
Docstrings for Octave class added.