Fixed docstring errors.  Closes #129
Merge branch 'issue129' into devel