merged stashed changes
merged stashed changes
don't repeat base class attributes in docstrings