format docstrings
Merge branch 'master' into docs
format docstring
conf