Minor docstrings change
Resolved merge conflicts
Merge pull request #2 from sthirugn/master

Minor docstrings change