Add docstrings
Merge remote-tracking branch 'upstream'