Fixed docstring inheritance and advancing version
Merge