Merge pull request #2 from edelbluth/master

Documentation corrected
Merge pull request #3 from edelbluth/master

Still trying to get the docstrings to work