Documentation slightly modified - including docstrings