add more comments
Merge branch 'docstring'