Merge branch 'feature/cdocstrings' into feature/docstrings