Updated class docstring
Resolved merge conflicts
merge conflict
Merge pull request #215 from sthirugn/docstring

Updated module docstrings for missing files