docstring inheritance
Merge pull request #298 from ahmadia/docfix

docstring inheritance