Added docstrings
Updated docstrings
Updated docstrings
Solved conflict with docstrings
-